From c01172287c0035e0d64cbf33a293d4c21e9175be Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Sun, 20 Oct 2024 19:04:35 +0200 Subject: [PATCH 01/33] vs2022 compatible project files --- build/vs/pjproject-vs14-common-config.props | 8 +- pjlib-util/build/pjlib_util.vcxproj | 1576 +++++------ pjlib-util/build/pjlib_util_test.vcxproj | 1290 ++++----- pjlib/build/pjlib.vcxproj | 2268 +++++++-------- pjlib/build/pjlib.vcxproj.filters | 929 +++--- pjlib/build/pjlib_test.vcxproj | 1 + pjlib/build/pjlib_test.vcxproj.filters | 3 + pjmedia/build/pjmedia.vcxproj | 1838 ++++++------ pjmedia/build/pjmedia.vcxproj.filters | 851 +++--- pjmedia/build/pjmedia_audiodev.vcxproj | 1586 +++++------ pjmedia/build/pjmedia_test.vcxproj | 1298 ++++----- pjmedia/build/pjmedia_videodev.vcxproj | 1395 ++++----- .../build/pjmedia_videodev.vcxproj.filters | 113 +- pjnath/build/pjnath.vcxproj | 1529 +++++----- pjnath/build/pjnath_test.vcxproj | 1187 ++++---- pjnath/build/pjnath_test.vcxproj.filters | 109 +- pjproject-vs14.sln | 21 +- pjsip-apps/build/libpjproject.vcxproj | 1889 +++++++------ pjsip-apps/build/pjsua.vcxproj | 1498 +++++----- pjsip-apps/build/pjsystest.vcxproj | 563 ++-- pjsip-apps/build/python_pjsua.vcxproj | 13 + pjsip-apps/build/sample_debug.vcxproj | 1157 ++++---- pjsip-apps/build/samples.vcxproj | 1111 ++++---- pjsip-apps/build/samples.vcxproj.filters | 255 +- pjsip-apps/build/swig_csharp_pjsua2.vcxproj | 20 +- pjsip-apps/build/swig_java_pjsua2.vcxproj | 6 + .../build/swig_java_pjsua2.vcxproj.filters | 60 +- .../winrt/cli/comp/pjsua_cli_uwp_comp.vcxproj | 16 +- .../comp/pjsua_cli_uwp_comp.vcxproj.filters | 2 +- .../winrt/cli/comp/pjsua_cli_wp8_comp.vcxproj | 330 +-- .../comp/pjsua_cli_wp8_comp.vcxproj.filters | 2 +- .../gui/uwp/VoipBackEnd/VoipBackEnd.vcxproj | 16 +- .../VoipBackEnd/VoipBackEnd.vcxproj.filters | 4 - .../winrt/gui/uwp/VoipHost/VoipHost.vcxproj | 16 +- .../gui/uwp/VoipHost/VoipHost.vcxproj.filters | 3 - pjsip/build/pjsip_core.vcxproj | 1482 +++++----- pjsip/build/pjsip_test.vcxproj | 1208 ++++---- pjsip/build/pjsip_ua.vcxproj | 1394 ++++----- pjsip/build/pjsua2_lib.vcxproj | 1420 +++++----- pjsip/build/pjsua2_lib.vcxproj.filters | 161 +- pjsip/build/pjsua_lib.vcxproj | 1628 ++++++----- pjsip/build/pjsua_lib.vcxproj.filters | 107 +- .../build/baseclasses/libbaseclasses.vcxproj | 1490 +++++----- third_party/build/g7221/libg7221codec.vcxproj | 1364 ++++----- third_party/build/gsm/libgsmcodec.vcxproj | 1466 +++++----- third_party/build/ilbc/libilbccodec.vcxproj | 1414 ++++----- .../build/milenage/libmilenage.vcxproj | 1376 ++++----- .../build/resample/libresample.vcxproj | 1381 ++++----- .../resample/libresample.vcxproj.filters | 71 +- third_party/build/speex/libspeex.vcxproj | 2514 +++++++++-------- .../build/speex/libspeex.vcxproj.filters | 506 ++-- third_party/build/srtp/libsrtp.vcxproj | 1560 +++++----- third_party/build/webrtc/libwebrtc.vcxproj | 1598 +++++------ .../build/webrtc/libwebrtc.vcxproj.filters | 541 ++-- .../build/webrtc_aec3/libwebrtc_aec3.vcxproj | 6 +- .../libwebrtc_aec3.vcxproj.filters | 15 +- third_party/build/yuv/libyuv.vcxproj | 1488 +++++----- third_party/build/yuv/libyuv.vcxproj.filters | 266 +- 58 files changed, 24311 insertions(+), 23108 deletions(-) diff --git a/build/vs/pjproject-vs14-common-config.props b/build/vs/pjproject-vs14-common-config.props index 456e4f02e1..d2e455b4c9 100644 --- a/build/vs/pjproject-vs14-common-config.props +++ b/build/vs/pjproject-vs14-common-config.props @@ -18,20 +18,20 @@ WinDesktop - v140 + v143 - v140 + v143 WIN32;PJ_WIN32=1;PJ_M_I386=1; WIN64;PJ_WIN64=1;PJ_M_X86_64=1; - PJ_M_ARM64=1; + PJ_M_ARM64=1; - v140 + v143 PJ_WIN32_UWP;UNICODE;_UNICODE; $(PreprocessorDef);PJ_M_ARMV7=1; 10.0.10586.0 diff --git a/pjlib-util/build/pjlib_util.vcxproj b/pjlib-util/build/pjlib_util.vcxproj index 88bc7cb907..a3a2d42fb9 100644 --- a/pjlib-util/build/pjlib_util.vcxproj +++ b/pjlib-util/build/pjlib_util.vcxproj @@ -1,788 +1,792 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} - pjlib_util - - en-US - - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - + + + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} + pjlib_util + + en-US + SAK + SAK + SAK + SAK + + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + $(BuildToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - - - MultiThreadedDebugDLL - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + + + MultiThreadedDebugDLL + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pjlib-util/build/pjlib_util_test.vcxproj b/pjlib-util/build/pjlib_util_test.vcxproj index b672709a7c..01c4cf3a42 100644 --- a/pjlib-util/build/pjlib_util_test.vcxproj +++ b/pjlib-util/build/pjlib_util_test.vcxproj @@ -1,644 +1,648 @@ - - - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {ED02BE13-8297-4770-8097-27DC2CCABF9A} - pjlib_util_test - - en-US - - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - - $(BuildToolset) - - - Application - StaticLibrary - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - - MultiThreadedDebugDLL - - - ..\lib\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;../../pjlib/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - - - - - - - - - {23d7679c-764c-4e02-8b29-bb882ceeefe2} - false - - - - - + + + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {ED02BE13-8297-4770-8097-27DC2CCABF9A} + pjlib_util_test + + en-US + SAK + SAK + SAK + SAK + + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + + $(BuildToolset) + + + Application + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + + MultiThreadedDebugDLL + + + ..\lib\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;../../pjlib/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + + + + + + + + {23d7679c-764c-4e02-8b29-bb882ceeefe2} + false + + + + + \ No newline at end of file diff --git a/pjlib/build/pjlib.vcxproj b/pjlib/build/pjlib.vcxproj index 4467f52e20..541635a668 100644 --- a/pjlib/build/pjlib.vcxproj +++ b/pjlib/build/pjlib.vcxproj @@ -1,1112 +1,1158 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {DA0E03ED-53A7-4050-8A85-90541C5509F8} - pjlib - - en-US - - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - - $(BuildToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - - - - - MultiThreadedDebugDLL - - - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - X64 - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - X64 - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - X64 - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - X64 - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - X64 - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - X64 - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - ../include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - true - true - $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) - $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) - $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) - $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) - $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) - $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) - MultiThreadedDLL - MultiThreadedDLL - MultiThreadedDLL - MultiThreadedDLL - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - - - - - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - true - - - true - - - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - - - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - - - - - - - - - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {DA0E03ED-53A7-4050-8A85-90541C5509F8} + pjlib + + en-US + + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + + $(BuildToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + + + + + MultiThreadedDebugDLL + + + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + X64 + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + X64 + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + X64 + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + X64 + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + X64 + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + X64 + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + ../include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + true + true + $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) + $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) + $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) + $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) + $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) + $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) + MultiThreadedDLL + MultiThreadedDLL + MultiThreadedDLL + MultiThreadedDLL + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + + + + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + true + + + true + + + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + + + + + + + + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pjlib/build/pjlib.vcxproj.filters b/pjlib/build/pjlib.vcxproj.filters index 2889b4666e..c66459f8e4 100644 --- a/pjlib/build/pjlib.vcxproj.filters +++ b/pjlib/build/pjlib.vcxproj.filters @@ -1,449 +1,482 @@ - - - - - {c8a8e8d9-1fbe-477c-91c9-5f4c495a2ad1} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {366d56a2-30a3-409b-9bd6-14ddc94069e0} - - - {77df8652-bc15-4733-a454-bbf8f16f93f1} - h;hpp;hxx;hm;inl - - - {3e7b3f2e-8699-43c9-801e-2c54e3f07023} - - - {4befc994-9aa4-47c8-99e7-5a51301220dd} - - - {4a92fce6-2308-44cf-aa66-00ccd5b333bd} - - - {3550aa38-c59d-4d5f-b458-1f93e0b16bbd} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\winrt - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Inline Files - - - Inline Files - - - Inline Files - - - Header Files\compat - - - Header Files\winrt - - - Header Files\compat - - - Header Files - - - Header Files\compat - - - Header Files - - - Header Files - - + + + + + {c8a8e8d9-1fbe-477c-91c9-5f4c495a2ad1} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {366d56a2-30a3-409b-9bd6-14ddc94069e0} + + + {77df8652-bc15-4733-a454-bbf8f16f93f1} + h;hpp;hxx;hm;inl + + + {3e7b3f2e-8699-43c9-801e-2c54e3f07023} + + + {4befc994-9aa4-47c8-99e7-5a51301220dd} + + + {4a92fce6-2308-44cf-aa66-00ccd5b333bd} + + + {3550aa38-c59d-4d5f-b458-1f93e0b16bbd} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\winrt + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\Other Targets + + + + + Source Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Inline Files + + + Inline Files + + + Inline Files + + + Header Files\compat + + + Header Files\winrt + + + Header Files\compat + + + Header Files + + + Header Files\compat + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/pjlib/build/pjlib_test.vcxproj b/pjlib/build/pjlib_test.vcxproj index 0801881867..daa27bb3ba 100644 --- a/pjlib/build/pjlib_test.vcxproj +++ b/pjlib/build/pjlib_test.vcxproj @@ -788,6 +788,7 @@ + diff --git a/pjlib/build/pjlib_test.vcxproj.filters b/pjlib/build/pjlib_test.vcxproj.filters index 64451af637..7ffdd42f68 100644 --- a/pjlib/build/pjlib_test.vcxproj.filters +++ b/pjlib/build/pjlib_test.vcxproj.filters @@ -123,6 +123,9 @@ Source Files + + Source Files + Source Files diff --git a/pjmedia/build/pjmedia.vcxproj b/pjmedia/build/pjmedia.vcxproj index 146bfa8ded..ab2aed9f63 100644 --- a/pjmedia/build/pjmedia.vcxproj +++ b/pjmedia/build/pjmedia.vcxproj @@ -1,802 +1,1038 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} - pjmedia - en-US - - true - Windows Store - $(PlatformVersion) - $(PlatformVersion) - $(AppTypeRev) - - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - - $(BuildToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - - - - - MultiThreadedDebugDLL - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - ProgramDatabase - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - ProgramDatabase - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - ProgramDatabase - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - ProgramDatabase - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - ProgramDatabase - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - ProgramDatabase - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - stdcpp17 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug-Dynamic-Client + ARM + + + Debug-Dynamic-Client + ARM64 + + + Debug-Dynamic-Client + Win32 + + + Debug-Dynamic-Client + x64 + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic-Client + ARM + + + Release-Dynamic-Client + ARM64 + + + Release-Dynamic-Client + Win32 + + + Release-Dynamic-Client + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} + pjmedia + en-US + + true + Windows Store + $(PlatformVersion) + $(PlatformVersion) + $(AppTypeRev) + SAK + SAK + SAK + SAK + + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + + $(BuildToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + + + + + MultiThreadedDebugDLL + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + true + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + true + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + ProgramDatabase + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + + ProgramDatabase + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + true + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + ProgramDatabase + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + + ProgramDatabase + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + true + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;PJ_CLIENT;%(PreprocessorDefinitions) + + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + true + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;PJ_CLIENT;%(PreprocessorDefinitions) + + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + ProgramDatabase + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + + ProgramDatabase + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + + ProgramDatabase + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + + ProgramDatabase + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + true + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) + _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) + + + + + + + + + + + + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + + + + + + + + + + + stdcpp17 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + true + + + + + \ No newline at end of file diff --git a/pjmedia/build/pjmedia.vcxproj.filters b/pjmedia/build/pjmedia.vcxproj.filters index 222e58cb14..a4267bf7b8 100644 --- a/pjmedia/build/pjmedia.vcxproj.filters +++ b/pjmedia/build/pjmedia.vcxproj.filters @@ -1,422 +1,431 @@ - - - - - {b47424a1-193e-423f-9735-05ce03549f4e} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {299e6683-786a-497a-ab65-a7ae49842874} - h;hpp;hxx;hm;inl - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - + + + + + {b47424a1-193e-423f-9735-05ce03549f4e} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {299e6683-786a-497a-ab65-a7ae49842874} + h;hpp;hxx;hm;inl + + + {6e2190e6-cb61-431d-9b62-784b4e93c46e} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files\vulkan + + \ No newline at end of file diff --git a/pjmedia/build/pjmedia_audiodev.vcxproj b/pjmedia/build/pjmedia_audiodev.vcxproj index a173093912..0549990b7f 100644 --- a/pjmedia/build/pjmedia_audiodev.vcxproj +++ b/pjmedia/build/pjmedia_audiodev.vcxproj @@ -1,792 +1,796 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {4281CA5E-1D48-45D4-A991-2718A454B4BA} - pjmedia_audiodev - - en-US - - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - - $(BuildToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - - - MultiThreadedDebugDLL - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - - - - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - true - $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) - true - $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) - true - $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) - true - $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) - true - $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) - true - $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) - true - MultiThreadedDebugDLL - MultiThreadedDebugDLL - MultiThreadedDLL - - - - - - - - - - - - - + + + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {4281CA5E-1D48-45D4-A991-2718A454B4BA} + pjmedia_audiodev + + en-US + SAK + SAK + SAK + SAK + + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + + $(BuildToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + + + MultiThreadedDebugDLL + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + + + + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + true + $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) + true + $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) + true + $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) + true + $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) + true + $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) + true + $(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories) + true + MultiThreadedDebugDLL + MultiThreadedDebugDLL + MultiThreadedDLL + + + + + + + + + + + + + \ No newline at end of file diff --git a/pjmedia/build/pjmedia_test.vcxproj b/pjmedia/build/pjmedia_test.vcxproj index 809644b168..7cff19083d 100644 --- a/pjmedia/build/pjmedia_test.vcxproj +++ b/pjmedia/build/pjmedia_test.vcxproj @@ -1,648 +1,652 @@ - - - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {21C0CECF-69DD-4F70-BC2B-9B4DE7F15277} - pjmedia_test - - en-US - - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - - $(BuildToolset) - - - Application - StaticLibrary - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - - - MultiThreadedDebugDLL - - - ..\lib\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - - - - - X64 - - - ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - MachineX64 - - - - - - ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - - - - - ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - - - - - X64 - - - ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - MachineX64 - - - - - - ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - - - - - ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - - - - - X64 - - - ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - MachineX64 - - - - - - ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - - - - - ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - - - - - X64 - - - ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - MachineX64 - - - - - - ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - - - - - - - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - - - - - - - - {23d7679c-764c-4e02-8b29-bb882ceeefe2} - false - - - - - + + + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {21C0CECF-69DD-4F70-BC2B-9B4DE7F15277} + pjmedia_test + + en-US + SAK + SAK + SAK + SAK + + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + + $(BuildToolset) + + + Application + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + + + MultiThreadedDebugDLL + + + ..\lib\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + + + + + X64 + + + ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + MachineX64 + + + + + + ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + + + + + ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + + + + + X64 + + + ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + MachineX64 + + + + + + ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + + + + + ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + + + + + X64 + + + ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + MachineX64 + + + + + + ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + + + + + ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + + + + + X64 + + + ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + MachineX64 + + + + + + ../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + + + + + + + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + + + + + + + {23d7679c-764c-4e02-8b29-bb882ceeefe2} + false + + + + + \ No newline at end of file diff --git a/pjmedia/build/pjmedia_videodev.vcxproj b/pjmedia/build/pjmedia_videodev.vcxproj index d10fcefff0..b74b027065 100644 --- a/pjmedia/build/pjmedia_videodev.vcxproj +++ b/pjmedia/build/pjmedia_videodev.vcxproj @@ -1,696 +1,701 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {A1989FF3-9894-40F4-B5A6-6EA364476E45} - pjmedia_audiodev - en-US - - - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - - $(BuildToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - - - MultiThreadedDebugDLL - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {A1989FF3-9894-40F4-B5A6-6EA364476E45} + pjmedia_audiodev + en-US + SAK + SAK + SAK + SAK + + + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + + $(BuildToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + + + MultiThreadedDebugDLL + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pjmedia/build/pjmedia_videodev.vcxproj.filters b/pjmedia/build/pjmedia_videodev.vcxproj.filters index 2abf4fe615..bfbb7e9caf 100644 --- a/pjmedia/build/pjmedia_videodev.vcxproj.filters +++ b/pjmedia/build/pjmedia_videodev.vcxproj.filters @@ -1,56 +1,59 @@ - - - - - {4899336d-07ac-46f4-8746-0e791939d4e5} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {11df22b5-15be-47bf-b275-4fd246912770} - h;hpp;hxx;hm;inl - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - + + + + + {4899336d-07ac-46f4-8746-0e791939d4e5} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {11df22b5-15be-47bf-b275-4fd246912770} + h;hpp;hxx;hm;inl + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/pjnath/build/pjnath.vcxproj b/pjnath/build/pjnath.vcxproj index fdbeccad14..2450b01664 100644 --- a/pjnath/build/pjnath.vcxproj +++ b/pjnath/build/pjnath.vcxproj @@ -1,764 +1,767 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} - pjnath - - en-US - - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - - $(BuildToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - - - - - MultiThreadedDebugDLL - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} + pjnath + + en-US + SAK + SAK + SAK + SAK + + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + + $(BuildToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + + + + + MultiThreadedDebugDLL + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pjnath/build/pjnath_test.vcxproj b/pjnath/build/pjnath_test.vcxproj index c7cca7e5f2..56c1e98f1e 100644 --- a/pjnath/build/pjnath_test.vcxproj +++ b/pjnath/build/pjnath_test.vcxproj @@ -1,592 +1,597 @@ - - - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {553C094C-F581-4A80-9540-D5D7B398A2C6} - pjnath_test - en-US - - - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - - $(BuildToolset) - - - Application - StaticLibrary - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - - - MultiThreadedDebugDLL - - - ..\lib\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - - - - - - - - - - - {23d7679c-764c-4e02-8b29-bb882ceeefe2} - false - - - - - + + + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {553C094C-F581-4A80-9540-D5D7B398A2C6} + pjnath_test + en-US + SAK + SAK + SAK + SAK + + + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + + $(BuildToolset) + + + Application + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + + + MultiThreadedDebugDLL + + + ..\lib\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + + + + + + + + + + + {23d7679c-764c-4e02-8b29-bb882ceeefe2} + false + + + + + \ No newline at end of file diff --git a/pjnath/build/pjnath_test.vcxproj.filters b/pjnath/build/pjnath_test.vcxproj.filters index b72c452e26..5a536a1592 100644 --- a/pjnath/build/pjnath_test.vcxproj.filters +++ b/pjnath/build/pjnath_test.vcxproj.filters @@ -1,54 +1,57 @@ - - - - - {b7a505e9-02f9-4fff-b21f-30f246f25966} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {2663f9ad-c87e-44e7-ad98-b394d9cfbdf8} - h;hpp;hxx;hm;inl - - - {16412efc-7642-484c-8100-3958bc86124c} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - + + + + + {b7a505e9-02f9-4fff-b21f-30f246f25966} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {2663f9ad-c87e-44e7-ad98-b394d9cfbdf8} + h;hpp;hxx;hm;inl + + + {16412efc-7642-484c-8100-3958bc86124c} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/pjproject-vs14.sln b/pjproject-vs14.sln index fcd0926d70..d54b016527 100644 --- a/pjproject-vs14.sln +++ b/pjproject-vs14.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31624.102 +# Visual Studio Version 17 +VisualStudioVersion = 17.10.35027.167 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1DFF1CF3-DBD7-4DA4-A36D-663D695EB678}" ProjectSection(SolutionItems) = preProject @@ -121,10 +121,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimplePjsua2CS", "pjsip-apps\src\swig\csharp\sample\SimplePjsua2CS\SimplePjsua2CS.csproj", "{3DCDD02D-C3CF-40EB-A66C-F7C2DAD93FD9}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - pjsip-apps\src\pjsua\winrt\cli\comp\pjsua_cli_shared_comp.vcxitems*{207e7bd4-7b11-4a40-ba3a-cc627762a7b6}*SharedItemsImports = 4 - pjsip-apps\src\pjsua\winrt\cli\comp\pjsua_cli_shared_comp.vcxitems*{45d41acc-2c3c-43d2-bc10-02aa73ffc7c7}*SharedItemsImports = 9 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM @@ -1571,8 +1567,8 @@ Global {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|ARM.ActiveCfg = Debug|Win32 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|ARM64.ActiveCfg = Debug|ARM64 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|ARM64.Build.0 = Debug|ARM64 - {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|Win32.ActiveCfg = Debug|Win32 - {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|Win32.Build.0 = Debug|Win32 + {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32 + {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|x64.ActiveCfg = Debug|x64 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|x64.Build.0 = Debug|x64 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Static|Any CPU.ActiveCfg = Release|x64 @@ -1597,8 +1593,8 @@ Global {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|ARM.ActiveCfg = Release|Win32 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|ARM64.ActiveCfg = Release|ARM64 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|ARM64.Build.0 = Release|ARM64 - {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|Win32.ActiveCfg = Release|Win32 - {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|Win32.Build.0 = Release|Win32 + {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32 + {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|x64.ActiveCfg = Release|x64 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|x64.Build.0 = Release|x64 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Static|Any CPU.ActiveCfg = Release|x64 @@ -2525,4 +2521,9 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9D1363FE-B481-479E-82A2-290F6C4DB91B} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + pjsip-apps\src\pjsua\winrt\cli\comp\pjsua_cli_shared_comp.vcxitems*{207e7bd4-7b11-4a40-ba3a-cc627762a7b6}*SharedItemsImports = 4 + pjsip-apps\src\pjsua\winrt\cli\comp\pjsua_cli_shared_comp.vcxitems*{45d41acc-2c3c-43d2-bc10-02aa73ffc7c7}*SharedItemsImports = 9 + pjsip-apps\src\pjsua\winrt\cli\comp\pjsua_cli_shared_comp.vcxitems*{e75efd41-c7f5-44c8-8ff1-a310d920989d}*SharedItemsImports = 4 + EndGlobalSection EndGlobal diff --git a/pjsip-apps/build/libpjproject.vcxproj b/pjsip-apps/build/libpjproject.vcxproj index f1bd4c4983..21dc49d83e 100644 --- a/pjsip-apps/build/libpjproject.vcxproj +++ b/pjsip-apps/build/libpjproject.vcxproj @@ -1,825 +1,1066 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {23D7679C-764C-4E02-8B29-BB882CEEEFE2} - libpjproject - - en-US - - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - - $(BuildToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - ..\..\lib\ - - - - - MultiThreadedDebugDLL - - - - - _LIB;%(PreprocessorDefinitions) - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - _LIB;%(PreprocessorDefinitions) - - - MultiThreadedDebugDLL - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - /ignore:4264 - - - - - X64 - - - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - _LIB;%(PreprocessorDefinitions) - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - _LIB;%(PreprocessorDefinitions) - - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - /ignore:4264 - - - - - X64 - - - _LIB;%(PreprocessorDefinitions) - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - _LIB;%(PreprocessorDefinitions) - - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - _LIB;%(PreprocessorDefinitions) - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - _LIB;%(PreprocessorDefinitions) - - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - /ignore:4264 - - - - - X64 - - - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - _LIB;%(PreprocessorDefinitions) - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - _LIB;%(PreprocessorDefinitions) - - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - /ignore:4264 - - - - - X64 - - - _LIB;%(PreprocessorDefinitions) - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - _LIB;%(PreprocessorDefinitions) - - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - _LIB;%(PreprocessorDefinitions) - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - _LIB;%(PreprocessorDefinitions) - - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - /ignore:4264 - - - - - X64 - - - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - _LIB;%(PreprocessorDefinitions) - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - _LIB;%(PreprocessorDefinitions) - - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - /ignore:4264 - - - - - X64 - - - _LIB;%(PreprocessorDefinitions) - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - _LIB;%(PreprocessorDefinitions) - - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - - - {fe07f272-ae7f-4549-9e9f-ef9b80cb1693} - false - - - {da0e03ed-53a7-4050-8a85-90541c5509f8} - false - - - {7fde3880-a4ab-49e3-b439-ebef0a0c7a65} - false - - - {4281ca5e-1d48-45d4-a991-2718a454b4ba} - false - - - {855dc8c0-d3e9-4a2e-ae47-116605a7bc9b} - false - - - {a1989ff3-9894-40f4-b5a6-6ea364476e45} - false - - - {a5d9aa24-08ed-48b9-bd65-f0a25e96bfc4} - false - - - {2bb84911-c1b4-4747-b93d-36aa82cc5031} - false - - - {4b5945cd-0cb3-49aa-a7ff-7612d93f82c0} - false - - - {b8719fd5-e8a6-4a36-943c-891d07f5dd21} - false - - - {b82cdd25-6903-430e-bd38-d8129a2015c1} - false - - - {9ca0fdfb-2172-41fc-b7f1-5ce915edcb37} - false - - - {e8a3f6fa-ae1c-4c8e-a0b6-9c8480324eaa} - false - - - {2a3f241e-682c-47e1-9543-dc28708b406a} - false - - - {e53aa5ff-b737-40aa-bd13-387efa99023d} - false - - - {b5fe16f8-3edb-4110-bd80-b4238cc01e8d} - false - - - {4bf51c21-5a30-423b-82fe-1ed410e5769d} - false - - - {6794b975-4e84-4f49-b2dc-c31f2224e03e} - false - - - {4b059dba-cd9c-4d0f-be8c-ffb4efd498e9} - false - - - {f0dbaa03-1ba3-4e3b-a2ca-727e3d3ab858} - false - - - {5BCF2773-3825-4D91-9D72-3E2F650DF1DB} - - - {6ac9b65f-0862-4a5c-8a9d-141516993130} - - - - - + + + + + Debug-Dynamic-Client + ARM + + + Debug-Dynamic-Client + ARM64 + + + Debug-Dynamic-Client + Win32 + + + Debug-Dynamic-Client + x64 + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic-Client + ARM + + + Release-Dynamic-Client + ARM64 + + + Release-Dynamic-Client + Win32 + + + Release-Dynamic-Client + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {23D7679C-764C-4E02-8B29-BB882CEEEFE2} + libpjproject + + en-US + SAK + SAK + SAK + SAK + 10.0 + + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + + $(BuildToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + ..\..\lib\ + + + + + MultiThreadedDebugDLL + + + + + _LIB;%(PreprocessorDefinitions) + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;%(PreprocessorDefinitions) + + + MultiThreadedDebugDLL + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + /ignore:4264 + + + + + X64 + + + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;%(PreprocessorDefinitions) + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;%(PreprocessorDefinitions) + + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + /ignore:4264 + + + + + X64 + + + _LIB;%(PreprocessorDefinitions) + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + _LIB;%(PreprocessorDefinitions) + + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;%(PreprocessorDefinitions) + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;%(PreprocessorDefinitions) + + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + /ignore:4264 + + + + + X64 + + + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;%(PreprocessorDefinitions) + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;PJ_CLIENT;%(PreprocessorDefinitions) + + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;%(PreprocessorDefinitions) + + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + /ignore:4264 + + + + + _LIB;%(PreprocessorDefinitions) + + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + /ignore:4264 + + + + + X64 + + + _LIB;%(PreprocessorDefinitions) + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + _LIB;%(PreprocessorDefinitions) + + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + _LIB;%(PreprocessorDefinitions) + + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + _LIB;%(PreprocessorDefinitions) + + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;%(PreprocessorDefinitions) + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;PJ_CLIENT;%(PreprocessorDefinitions) + + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;%(PreprocessorDefinitions) + + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + /ignore:4264 + + + + + _LIB;%(PreprocessorDefinitions) + + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + /ignore:4264 + + + + + X64 + + + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;%(PreprocessorDefinitions) + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;%(PreprocessorDefinitions) + + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + /ignore:4264 + + + + + X64 + + + _LIB;%(PreprocessorDefinitions) + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + _LIB;%(PreprocessorDefinitions) + + + + + true + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + + + {fe07f272-ae7f-4549-9e9f-ef9b80cb1693} + false + + + {da0e03ed-53a7-4050-8a85-90541c5509f8} + false + + + {7fde3880-a4ab-49e3-b439-ebef0a0c7a65} + false + + + {4281ca5e-1d48-45d4-a991-2718a454b4ba} + false + + + {855dc8c0-d3e9-4a2e-ae47-116605a7bc9b} + false + + + {a1989ff3-9894-40f4-b5a6-6ea364476e45} + false + + + {a5d9aa24-08ed-48b9-bd65-f0a25e96bfc4} + false + + + {2bb84911-c1b4-4747-b93d-36aa82cc5031} + false + + + {4b5945cd-0cb3-49aa-a7ff-7612d93f82c0} + false + + + {b8719fd5-e8a6-4a36-943c-891d07f5dd21} + false + + + {b82cdd25-6903-430e-bd38-d8129a2015c1} + false + + + {9ca0fdfb-2172-41fc-b7f1-5ce915edcb37} + false + + + {e8a3f6fa-ae1c-4c8e-a0b6-9c8480324eaa} + false + + + {2a3f241e-682c-47e1-9543-dc28708b406a} + false + + + {e53aa5ff-b737-40aa-bd13-387efa99023d} + false + + + {b5fe16f8-3edb-4110-bd80-b4238cc01e8d} + false + + + {4bf51c21-5a30-423b-82fe-1ed410e5769d} + false + + + {6794b975-4e84-4f49-b2dc-c31f2224e03e} + false + + + {4b059dba-cd9c-4d0f-be8c-ffb4efd498e9} + false + + + {f0dbaa03-1ba3-4e3b-a2ca-727e3d3ab858} + false + + + {5BCF2773-3825-4D91-9D72-3E2F650DF1DB} + + + {6ac9b65f-0862-4a5c-8a9d-141516993130} + + + + + \ No newline at end of file diff --git a/pjsip-apps/build/pjsua.vcxproj b/pjsip-apps/build/pjsua.vcxproj index 6399e45b40..98a8b4c10c 100644 --- a/pjsip-apps/build/pjsua.vcxproj +++ b/pjsip-apps/build/pjsua.vcxproj @@ -1,748 +1,752 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {8310649E-A25E-4AF0-91E8-9E3CC659BB89} - pjsua - - en-US - - - - Application - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - - $(BuildToolset) - - - Application - StaticLibrary - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - - - - - MultiThreadedDebugDLL - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - X64 - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - MachineX64 - - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - X64 - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - MachineX64 - - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - X64 - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - MachineX64 - - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - X64 - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - MachineX64 - - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - X64 - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - MachineX64 - - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - - - X64 - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - MachineX64 - - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - true - - - Default - - - Default - Default - Default - Default - Default - Default - - - Default - Default - Default - Default - Default - Default - - - Default - Default - Default - Default - Default - Default - - - Default - Default - Default - Default - Default - Default - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - - - - - - - {23d7679c-764c-4e02-8b29-bb882ceeefe2} - false - - - - - + + + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {8310649E-A25E-4AF0-91E8-9E3CC659BB89} + pjsua + + en-US + SAK + SAK + SAK + SAK + + + + Application + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + + $(BuildToolset) + + + Application + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + + + + + MultiThreadedDebugDLL + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + X64 + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + MachineX64 + + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + msvcrt.lib;%(IgnoreSpecificDefaultLibraries) + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + X64 + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + msvcrt.lib;%(IgnoreSpecificDefaultLibraries) + MachineX64 + + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + msvcrt.lib;%(IgnoreSpecificDefaultLibraries) + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + X64 + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + MachineX64 + + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + X64 + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + MachineX64 + + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + X64 + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + MachineX64 + + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + + + X64 + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + MachineX64 + + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + true + + + Default + + + Default + Default + Default + Default + Default + Default + + + Default + Default + Default + Default + Default + Default + + + Default + Default + Default + Default + Default + Default + + + Default + Default + Default + Default + Default + Default + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + + + + + + {23d7679c-764c-4e02-8b29-bb882ceeefe2} + false + + + + + \ No newline at end of file diff --git a/pjsip-apps/build/pjsystest.vcxproj b/pjsip-apps/build/pjsystest.vcxproj index 568b2ff816..eed1621c6e 100644 --- a/pjsip-apps/build/pjsystest.vcxproj +++ b/pjsip-apps/build/pjsystest.vcxproj @@ -1,205 +1,360 @@ - - - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB} - pjsystest - Win32Proj - - en-US - - - - Application - v140 - - - Application - v140 - - - Application - v140 - - - Application - v140 - - - Application - v140 - - - Application - v140 - - - - $(BuildToolset) - - - Application - StaticLibrary - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - - - - - MultiThreadedDebugDLL - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - X64 - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - MachineX64 - - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - X64 - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - MachineX64 - - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - - true - true - true - true - true - true - - - - - - - - - - {23d7679c-764c-4e02-8b29-bb882ceeefe2} - false - - - - - + + + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB} + pjsystest + Win32Proj + + en-US + SAK + SAK + SAK + SAK + + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + + $(BuildToolset) + + + Application + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + + + + + MultiThreadedDebugDLL + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + X64 + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + MachineX64 + + + + + X64 + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + MachineX64 + + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + X64 + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + MachineX64 + + + + + X64 + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + MachineX64 + + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + + true + true + true + true + true + true + true + true + true + true + true + true + + + + + + + + + + {23d7679c-764c-4e02-8b29-bb882ceeefe2} + false + + + + + \ No newline at end of file diff --git a/pjsip-apps/build/python_pjsua.vcxproj b/pjsip-apps/build/python_pjsua.vcxproj index 1cdef56e58..fb79c4ff54 100644 --- a/pjsip-apps/build/python_pjsua.vcxproj +++ b/pjsip-apps/build/python_pjsua.vcxproj @@ -18,6 +18,8 @@ Win32 + + {0C91838B-3372-40B4-A764-DE075A4BC94B} @@ -46,6 +48,11 @@ false MultiByte + + $(BuildToolset) + + + @@ -85,6 +92,12 @@ false + + + $(BuildToolset) + + + _DEBUG;%(PreprocessorDefinitions) diff --git a/pjsip-apps/build/sample_debug.vcxproj b/pjsip-apps/build/sample_debug.vcxproj index ffccd6b71e..ec2c48906a 100644 --- a/pjsip-apps/build/sample_debug.vcxproj +++ b/pjsip-apps/build/sample_debug.vcxproj @@ -1,577 +1,582 @@ - - - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {A0F1AA62-0F6F-420D-B09A-AC04B6862821} - sample_debug - - en-US - - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - - $(BuildToolset) - - - Application - StaticLibrary - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - - - MultiThreadedDebugDLL - - - ..\lib\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - - - - - X64 - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - MachineX64 - - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - - - - - X64 - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - MachineX64 - - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - - - - - X64 - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - MachineX64 - - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - - - - - X64 - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - MachineX64 - - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) - ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) - - - - - - - - {b82cdd25-6903-430e-bd38-d8129a2015c1} - false - - - {23d7679c-764c-4e02-8b29-bb882ceeefe2} - false - - - - - + + + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {A0F1AA62-0F6F-420D-B09A-AC04B6862821} + sample_debug + + en-US + SAK + SAK + SAK + SAK + + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + + $(BuildToolset) + + + Application + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + + + MultiThreadedDebugDLL + + + ..\lib\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + + + + + X64 + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + MachineX64 + + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + + + + + X64 + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + MachineX64 + + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + EnableFastChecks + + + iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + + + + + X64 + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + MachineX64 + + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + + + + + X64 + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + MachineX64 + + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies) + ..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries) + + + + + + + + {b82cdd25-6903-430e-bd38-d8129a2015c1} + false + + + {23d7679c-764c-4e02-8b29-bb882ceeefe2} + false + + + + + \ No newline at end of file diff --git a/pjsip-apps/build/samples.vcxproj b/pjsip-apps/build/samples.vcxproj index 442f77d933..9a316d6f5f 100644 --- a/pjsip-apps/build/samples.vcxproj +++ b/pjsip-apps/build/samples.vcxproj @@ -1,554 +1,559 @@ - - - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {E378A1FC-0C9C-4462-860F-7E60BC1BF84E} - samples - MakeFileProj - - en-US - - - - Makefile - v140 - false - - - Makefile - v140 - false - - - Makefile - v140 - false - - - Makefile - v140 - false - - - Makefile - v140 - false - - - Makefile - v140 - false - - - Makefile - v140 - false - - - Makefile - v140 - false - - - Makefile - v140 - false - - - Makefile - v140 - false - - - Makefile - v140 - false - - - Makefile - v140 - false - - - Makefile - v140 - false - - - Makefile - v140 - false - - - Makefile - v140 - false - - - Makefile - v140 - false - - - Makefile - v140 - false - - - Makefile - v140 - false - - - - $(BuildToolset) - - - StaticLibrary - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - - - - - NotUsing - false - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - MultiThreadedDebugDLL - - - /Ignore:4006 %(AdditionalOptions) - - - - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=win32 - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=win32 /a - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=win32 clean - All samples - - - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=win64 - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=win64 /a - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=win64 clean - All samples - - - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=ARM64 - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=ARM64 /a - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=ARM64 clean - All samples - - - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=win32 - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=win32 /a - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=win32 clean - All samples - - - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=win64 - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=win64 /a - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=win64 clean - All samples - - - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=ARM64 - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=ARM64 /a - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=ARM64 clean - All samples - - - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=win32s - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=win32 /a - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=win32 clean - All samples - - - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=win64 - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=win64 /a - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=win64 clean - All samples - - - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=ARM64 - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=ARM64 /a - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=ARM64 clean - All samples - - - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=win32 - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=win32 /a - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=win32 clean - All samples - - - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=win64 - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=win64 /a - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=win64 clean - All samples - - - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=ARM64 - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=ARM64 /a - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=ARM64 clean - All samples - - - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=win32 - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=win32 /a - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=win32 clean - All samples - - - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=win64 - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=win64 /a - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=win64 clean - All samples - - - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=ARM64 - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=ARM64 /a - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=ARM64 clean - All samples - - - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=win32 - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=win32 /a - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=win32 clean - All samples - - - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=win64 - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=win64 /a - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=win64 clean - All samples - - - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=ARM64 - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=ARM64 /a - nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=ARM64 clean - All samples - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - - - - - - - - - - - - - - - - - - - - {23d7679c-764c-4e02-8b29-bb882ceeefe2} - false - - - - - + + + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {E378A1FC-0C9C-4462-860F-7E60BC1BF84E} + samples + MakeFileProj + + en-US + SAK + SAK + SAK + SAK + + + + Makefile + v140 + false + + + Makefile + v140 + false + + + Makefile + v140 + false + + + Makefile + v140 + false + + + Makefile + v140 + false + + + Makefile + v140 + false + + + Makefile + v140 + false + + + Makefile + v140 + false + + + Makefile + v140 + false + + + Makefile + v140 + false + + + Makefile + v140 + false + + + Makefile + v140 + false + + + Makefile + v140 + false + + + Makefile + v140 + false + + + Makefile + v140 + false + + + Makefile + v140 + false + + + Makefile + v140 + false + + + Makefile + v140 + false + + + + $(BuildToolset) + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + + + + + NotUsing + false + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + + + /Ignore:4006 %(AdditionalOptions) + + + + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=win32 + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=win32 /a + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=win32 clean + All samples + + + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=win64 + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=win64 /a + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=win64 clean + All samples + + + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=ARM64 + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=ARM64 /a + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=ARM64 clean + All samples + + + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=win32 + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=win32 /a + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=win32 clean + All samples + + + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=win64 + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=win64 /a + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=win64 clean + All samples + + + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=ARM64 + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=ARM64 /a + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=ARM64 clean + All samples + + + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=win32s + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=win32 /a + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=win32 clean + All samples + + + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=win64 + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=win64 /a + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=win64 clean + All samples + + + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=ARM64 + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=ARM64 /a + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=ARM64 clean + All samples + + + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=win32 + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=win32 /a + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=win32 clean + All samples + + + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=win64 + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=win64 /a + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=win64 clean + All samples + + + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=ARM64 + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=ARM64 /a + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=ARM64 clean + All samples + + + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=win32 + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=win32 /a + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=win32 clean + All samples + + + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=win64 + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=win64 /a + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=win64 clean + All samples + + + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=ARM64 + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=ARM64 /a + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=ARM64 clean + All samples + + + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=win32 + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=win32 /a + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=win32 clean + All samples + + + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=win64 + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=win64 /a + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=win64 clean + All samples + + + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=ARM64 + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=ARM64 /a + nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=ARM64 clean + All samples + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + true + + + + + + + + + + + + + + + + + + + + + + + {23d7679c-764c-4e02-8b29-bb882ceeefe2} + false + + + + + \ No newline at end of file diff --git a/pjsip-apps/build/samples.vcxproj.filters b/pjsip-apps/build/samples.vcxproj.filters index f9cc9fc8a2..dae2a5ba79 100644 --- a/pjsip-apps/build/samples.vcxproj.filters +++ b/pjsip-apps/build/samples.vcxproj.filters @@ -1,127 +1,130 @@ - - - - - {edee2571-42c7-4b19-a770-463c50ecadf1} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {b4946932-b2c0-4674-8c52-84055cf6252a} - h;hpp;hxx;hm;inl - - - {62edc4d5-7a09-42e6-9c5a-f19689126b97} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - - - - + + + + + {edee2571-42c7-4b19-a770-463c50ecadf1} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {b4946932-b2c0-4674-8c52-84055cf6252a} + h;hpp;hxx;hm;inl + + + {62edc4d5-7a09-42e6-9c5a-f19689126b97} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + + + + \ No newline at end of file diff --git a/pjsip-apps/build/swig_csharp_pjsua2.vcxproj b/pjsip-apps/build/swig_csharp_pjsua2.vcxproj index 07f11ad068..5ef9a9428f 100644 --- a/pjsip-apps/build/swig_csharp_pjsua2.vcxproj +++ b/pjsip-apps/build/swig_csharp_pjsua2.vcxproj @@ -32,46 +32,52 @@ {549DFCA7-7B0C-410D-BCEC-9C204AD45638} pjsua2 swig_csharp_pjsua2 - 8.1 + 10.0 DynamicLibrary - v140 + v143 MultiByte true true DynamicLibrary - v140 + v143 MultiByte true DynamicLibrary - v140 + v143 MultiByte true true DynamicLibrary - v140 + v143 MultiByte true DynamicLibrary - v140 + v143 MultiByte true DynamicLibrary - v140 + v143 MultiByte + + + $(BuildToolset) + + + diff --git a/pjsip-apps/build/swig_java_pjsua2.vcxproj b/pjsip-apps/build/swig_java_pjsua2.vcxproj index 16b9e1feba..8569444fce 100644 --- a/pjsip-apps/build/swig_java_pjsua2.vcxproj +++ b/pjsip-apps/build/swig_java_pjsua2.vcxproj @@ -67,6 +67,12 @@ v140 MultiByte + + + $(BuildToolset) + + + diff --git a/pjsip-apps/build/swig_java_pjsua2.vcxproj.filters b/pjsip-apps/build/swig_java_pjsua2.vcxproj.filters index 405471e84d..f7e6bae5c6 100644 --- a/pjsip-apps/build/swig_java_pjsua2.vcxproj.filters +++ b/pjsip-apps/build/swig_java_pjsua2.vcxproj.filters @@ -1,30 +1,32 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - - - Header Files - - - - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + False + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + False + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + + + + Source Files + + + + + Header Files + + \ No newline at end of file diff --git a/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_uwp_comp.vcxproj b/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_uwp_comp.vcxproj index d901ab91ac..4fbaade241 100644 --- a/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_uwp_comp.vcxproj +++ b/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_uwp_comp.vcxproj @@ -42,43 +42,43 @@ 14.0 true Windows Store - 10.0.10240.0 - 10.0.10240.0 + 10.0 + 10.0.22621.0 10.0 DynamicLibrary true - v140 + v143 DynamicLibrary true - v140 + v143 DynamicLibrary true - v140 + v143 DynamicLibrary false true - v140 + v143 DynamicLibrary false true - v140 + v143 DynamicLibrary false true - v140 + v143 diff --git a/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_uwp_comp.vcxproj.filters b/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_uwp_comp.vcxproj.filters index c31757ec1c..df723cc9a9 100644 --- a/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_uwp_comp.vcxproj.filters +++ b/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_uwp_comp.vcxproj.filters @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_wp8_comp.vcxproj b/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_wp8_comp.vcxproj index 9dc719a02d..eed33a8dbe 100644 --- a/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_wp8_comp.vcxproj +++ b/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_wp8_comp.vcxproj @@ -1,166 +1,166 @@ - - - - - Debug - Win32 - - - Debug - ARM - - - Release - Win32 - - - Release - ARM - - - - {e75efd41-c7f5-44c8-8ff1-a310d920989d} - PjsuaCLI.BackEnd - en-US - 11.0 - true - pjsua_cli_wp8_comp - - - - DynamicLibrary - true - v110_wp80 - - - DynamicLibrary - true - v110_wp80 - - - DynamicLibrary - false - true - v110_wp80 - - - DynamicLibrary - false - true - v110_wp80 - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - pjsua-cli-wp8-comp-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - - _WINRT_DLL;%(PreprocessorDefinitions) - - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - MultiThreadedDebugDLL - true - - - Console - false - ole32.lib;%(IgnoreSpecificDefaultLibraries) - ..\lib\pjsua-cli-wp8-comp-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).dll - true - Phoneaudioses.lib;%(AdditionalDependencies) - - - - - _WINRT_DLL;NDEBUG;%(PreprocessorDefinitions) - - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - true - - - Console - false - ole32.lib;%(IgnoreSpecificDefaultLibraries) - ..\lib\pjsua-cli-wp8-comp-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).dll - true - - - - - _WINRT_DLL;%(PreprocessorDefinitions) - - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - true - ../../../../../../pjsip/include;../../../../../../pjlib/include;../../../../../../pjlib-util/include;../../../../../../pjmedia/include;../../../../../../pjnath/include;%(AdditionalIncludeDirectories) - MultiThreadedDebugDLL - Default - - - Console - false - libcmtd.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - ..\lib\pjsua-cli-wp8-comp-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).dll - true - ws2_32.lib;Phoneaudioses.lib;%(AdditionalDependencies) - - - - - _WINRT_DLL;NDEBUG;%(PreprocessorDefinitions) - - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - true - ../../../../../../pjsip/include;../../../../../../pjlib/include;../../../../../../pjlib-util/include;../../../../../../pjmedia/include;../../../../../../pjnath/include;%(AdditionalIncludeDirectories) - - - Console - false - libcmtd.lib;%(IgnoreSpecificDefaultLibraries) - ..\lib\pjsua-cli-wp8-comp-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).dll - true - ws2_32.lib;%(AdditionalDependencies) - - - - - true - false - - - - - {8310649e-a25e-4af0-91e8-9e3cc659bb89} - - - - - - - - + + + + + Debug + Win32 + + + Debug + ARM + + + Release + Win32 + + + Release + ARM + + + + {e75efd41-c7f5-44c8-8ff1-a310d920989d} + PjsuaCLI.BackEnd + en-US + 11.0 + true + pjsua_cli_wp8_comp + + + + DynamicLibrary + true + v143 + + + DynamicLibrary + true + v143 + + + DynamicLibrary + false + true + v143 + + + DynamicLibrary + false + true + v143 + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + pjsua-cli-wp8-comp-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + + _WINRT_DLL;%(PreprocessorDefinitions) + + $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) + MultiThreadedDebugDLL + true + + + Console + false + ole32.lib;%(IgnoreSpecificDefaultLibraries) + ..\lib\pjsua-cli-wp8-comp-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).dll + true + Phoneaudioses.lib;%(AdditionalDependencies) + + + + + _WINRT_DLL;NDEBUG;%(PreprocessorDefinitions) + + $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) + true + + + Console + false + ole32.lib;%(IgnoreSpecificDefaultLibraries) + ..\lib\pjsua-cli-wp8-comp-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).dll + true + + + + + _WINRT_DLL;%(PreprocessorDefinitions) + + $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) + true + ../../../../../../pjsip/include;../../../../../../pjlib/include;../../../../../../pjlib-util/include;../../../../../../pjmedia/include;../../../../../../pjnath/include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + Default + + + Console + false + libcmtd.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries) + ..\lib\pjsua-cli-wp8-comp-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).dll + true + ws2_32.lib;Phoneaudioses.lib;%(AdditionalDependencies) + + + + + _WINRT_DLL;NDEBUG;%(PreprocessorDefinitions) + + $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) + true + ../../../../../../pjsip/include;../../../../../../pjlib/include;../../../../../../pjlib-util/include;../../../../../../pjmedia/include;../../../../../../pjnath/include;%(AdditionalIncludeDirectories) + + + Console + false + libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + ..\lib\pjsua-cli-wp8-comp-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).dll + true + ws2_32.lib;%(AdditionalDependencies) + + + + + true + false + + + + + {8310649e-a25e-4af0-91e8-9e3cc659bb89} + + + + + + + + \ No newline at end of file diff --git a/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_wp8_comp.vcxproj.filters b/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_wp8_comp.vcxproj.filters index 9cd8510566..ef1ebf5863 100644 --- a/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_wp8_comp.vcxproj.filters +++ b/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_wp8_comp.vcxproj.filters @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipBackEnd/VoipBackEnd.vcxproj b/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipBackEnd/VoipBackEnd.vcxproj index 0c00b3432d..b94c917023 100644 --- a/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipBackEnd/VoipBackEnd.vcxproj +++ b/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipBackEnd/VoipBackEnd.vcxproj @@ -40,43 +40,43 @@ 14.0 true Windows Store - 10.0.10586.0 - 10.0.10240.0 + 10.0 + 10.0.22000.0 10.0 DynamicLibrary true - v140 + v143 DynamicLibrary true - v140 + v143 DynamicLibrary true - v140 + v143 DynamicLibrary false true - v140 + v143 DynamicLibrary false true - v140 + v143 DynamicLibrary false true - v140 + v143 diff --git a/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipBackEnd/VoipBackEnd.vcxproj.filters b/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipBackEnd/VoipBackEnd.vcxproj.filters index 941644e775..1fecc4de24 100644 --- a/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipBackEnd/VoipBackEnd.vcxproj.filters +++ b/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipBackEnd/VoipBackEnd.vcxproj.filters @@ -7,13 +7,9 @@ - - - - \ No newline at end of file diff --git a/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipHost/VoipHost.vcxproj b/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipHost/VoipHost.vcxproj index 154139831e..6169481bc2 100644 --- a/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipHost/VoipHost.vcxproj +++ b/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipHost/VoipHost.vcxproj @@ -43,43 +43,43 @@ 14.0 true Windows Store - 10.0.10586.0 - 10.0.10240.0 + 10.0 + 10.0.22000.0 10.0 Application true - v140 + v143 Application true - v140 + v143 Application true - v140 + v143 Application false true - v140 + v143 Application false true - v140 + v143 Application false true - v140 + v143 diff --git a/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipHost/VoipHost.vcxproj.filters b/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipHost/VoipHost.vcxproj.filters index 6020392735..1995013d74 100644 --- a/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipHost/VoipHost.vcxproj.filters +++ b/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipHost/VoipHost.vcxproj.filters @@ -6,9 +6,6 @@ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tga;tiff;tif;png;wav;mfcribbon-ms - - - diff --git a/pjsip/build/pjsip_core.vcxproj b/pjsip/build/pjsip_core.vcxproj index 56f869fcf4..66600fe064 100644 --- a/pjsip/build/pjsip_core.vcxproj +++ b/pjsip/build/pjsip_core.vcxproj @@ -1,740 +1,744 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {2BB84911-C1B4-4747-B93D-36AA82CC5031} - pjsip_core - - en-US - - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - - $(BuildToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - - - MultiThreadedDebugDLL - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {2BB84911-C1B4-4747-B93D-36AA82CC5031} + pjsip_core + + en-US + SAK + SAK + SAK + SAK + + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + + $(BuildToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + + + MultiThreadedDebugDLL + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pjsip/build/pjsip_test.vcxproj b/pjsip/build/pjsip_test.vcxproj index 055f39e446..ea3f4dd753 100644 --- a/pjsip/build/pjsip_test.vcxproj +++ b/pjsip/build/pjsip_test.vcxproj @@ -1,603 +1,607 @@ - - - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {B3F7D4E9-702F-4EB4-ADA8-098D0A83D770} - pjsip_test - - en-US - - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - - $(BuildToolset) - - - Application - StaticLibrary - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - - - MultiThreadedDebugDLL - - - ..\lib\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - {23d7679c-764c-4e02-8b29-bb882ceeefe2} - false - - - - - + + + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {B3F7D4E9-702F-4EB4-ADA8-098D0A83D770} + pjsip_test + + en-US + SAK + SAK + SAK + SAK + + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + + $(BuildToolset) + + + Application + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + + + MultiThreadedDebugDLL + + + ..\lib\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + {23d7679c-764c-4e02-8b29-bb882ceeefe2} + false + + + + + \ No newline at end of file diff --git a/pjsip/build/pjsip_ua.vcxproj b/pjsip/build/pjsip_ua.vcxproj index 2b08150ca2..29482708d7 100644 --- a/pjsip/build/pjsip_ua.vcxproj +++ b/pjsip/build/pjsip_ua.vcxproj @@ -1,696 +1,700 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {B8719FD5-E8A6-4A36-943C-891D07F5DD21} - pjsip_ua - - en-US - - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - - $(BuildToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - - - MultiThreadedDebugDLL - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {B8719FD5-E8A6-4A36-943C-891D07F5DD21} + pjsip_ua + + en-US + SAK + SAK + SAK + SAK + + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + + $(BuildToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + + + MultiThreadedDebugDLL + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pjsip/build/pjsua2_lib.vcxproj b/pjsip/build/pjsua2_lib.vcxproj index 8238d84926..aa1c13ff9d 100644 --- a/pjsip/build/pjsua2_lib.vcxproj +++ b/pjsip/build/pjsua2_lib.vcxproj @@ -1,705 +1,717 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {B82CDD25-6903-430E-BD38-D8129A2015C1} - pjsua2_lib - - en-US - - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - - $(BuildToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - - - MultiThreadedDebugDLL - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - MultiThreadedDebugDLL - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {B82CDD25-6903-430E-BD38-D8129A2015C1} + pjsua2_lib + + en-US + SAK + SAK + SAK + SAK + 10.0 + + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + + $(BuildToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + + + MultiThreadedDebugDLL + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + stdcpp17 + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + MultiThreadedDebugDLL + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + stdcpp17 + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + stdcpp17 + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + stdcpp17 + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + stdcpp17 + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + stdcpp17 + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pjsip/build/pjsua2_lib.vcxproj.filters b/pjsip/build/pjsua2_lib.vcxproj.filters index 232baf1ef8..402ee3f44b 100644 --- a/pjsip/build/pjsua2_lib.vcxproj.filters +++ b/pjsip/build/pjsua2_lib.vcxproj.filters @@ -1,80 +1,83 @@ - - - - - {44ecb7ef-36e9-4d66-ab18-245108f7f626} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {374e9863-689a-41ac-8361-dd9ae01ae0f2} - h;hpp;hxx;hm;inl - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - + + + + + {44ecb7ef-36e9-4d66-ab18-245108f7f626} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {374e9863-689a-41ac-8361-dd9ae01ae0f2} + h;hpp;hxx;hm;inl + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/pjsip/build/pjsua_lib.vcxproj b/pjsip/build/pjsua_lib.vcxproj index 8af5143510..8f6641226c 100644 --- a/pjsip/build/pjsua_lib.vcxproj +++ b/pjsip/build/pjsua_lib.vcxproj @@ -1,694 +1,936 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} - pjsua_lib - - en-US - - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - - $(BuildToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - - - MultiThreadedDebugDLL - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - - - - - - - - - - - - - - - + + + + + Debug-Dynamic-Client + ARM + + + Debug-Dynamic-Client + ARM64 + + + Debug-Dynamic-Client + Win32 + + + Debug-Dynamic-Client + x64 + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic-Client + ARM + + + Release-Dynamic-Client + ARM64 + + + Release-Dynamic-Client + Win32 + + + Release-Dynamic-Client + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} + pjsua_lib + + en-US + SAK + SAK + SAK + SAK + + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + + $(BuildToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + + + MultiThreadedDebugDLL + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;PJ_CLIENT;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;PJ_CLIENT;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + + + + + + + + + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + + + + + + + + + \ No newline at end of file diff --git a/pjsip/build/pjsua_lib.vcxproj.filters b/pjsip/build/pjsua_lib.vcxproj.filters index 9a326cce31..9850a7db96 100644 --- a/pjsip/build/pjsua_lib.vcxproj.filters +++ b/pjsip/build/pjsua_lib.vcxproj.filters @@ -1,50 +1,59 @@ - - - - - {0478752b-c2a1-46d0-981b-63f3b004f892} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {e83578b3-3953-431c-8cb0-3e0da189893c} - h;hpp;hxx;hm;inl - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - + + + + + {0478752b-c2a1-46d0-981b-63f3b004f892} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {e83578b3-3953-431c-8cb0-3e0da189893c} + h;hpp;hxx;hm;inl + + + {c3260fa6-0427-42b4-bc21-6a450f043b27} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\vulkan + + + Source Files\vulkan + + + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/third_party/build/baseclasses/libbaseclasses.vcxproj b/third_party/build/baseclasses/libbaseclasses.vcxproj index 1fe243bc0b..3bea3a7de0 100644 --- a/third_party/build/baseclasses/libbaseclasses.vcxproj +++ b/third_party/build/baseclasses/libbaseclasses.vcxproj @@ -1,744 +1,748 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} - libbaseclasses - - en-US - - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - - $(BuildToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - ..\..\lib\ - - - - - MultiThreadedDebugDLL - - - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - - - NDEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - - - NDEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - - - NDEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - - - NDEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - - - _DEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - - - _DEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - ProgramDatabase - - - _DEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - ProgramDatabase - - - _DEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - - - _DEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - - - _DEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - ProgramDatabase - - - _DEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - ProgramDatabase - - - _DEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - - - _DEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - - - _DEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - ProgramDatabase - - - _DEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - ProgramDatabase - - - _DEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - - - NDEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - - - NDEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - - - NDEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - - - NDEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - - - NDEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - - - NDEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - - - NDEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) - - - NDEBUG;WIN32;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} + libbaseclasses + + en-US + SAK + SAK + SAK + SAK + + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + + $(BuildToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + ..\..\lib\ + + + + + MultiThreadedDebugDLL + + + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + + + NDEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + + + NDEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + + + NDEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + + + NDEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + + + _DEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + + + _DEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + ProgramDatabase + + + _DEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + ProgramDatabase + + + _DEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + + + _DEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + + + _DEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + ProgramDatabase + + + _DEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + ProgramDatabase + + + _DEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + + + _DEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + + + _DEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + ProgramDatabase + + + _DEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + ProgramDatabase + + + _DEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + + + NDEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + + + NDEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + + + NDEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + + + NDEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + + + NDEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + + + NDEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + + + NDEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions) + + + NDEBUG;WIN32;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/third_party/build/g7221/libg7221codec.vcxproj b/third_party/build/g7221/libg7221codec.vcxproj index 58029dc9e3..92059a769c 100644 --- a/third_party/build/g7221/libg7221codec.vcxproj +++ b/third_party/build/g7221/libg7221codec.vcxproj @@ -1,681 +1,685 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {2A3F241E-682C-47E1-9543-DC28708B406A} - libg7221codec - en-US - - - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - - - - $(BuildToolset) - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - ..\..\lib\ - - - - - MultiThreadedDebugDLL - - - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {2A3F241E-682C-47E1-9543-DC28708B406A} + libg7221codec + en-US + SAK + SAK + SAK + SAK + + + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + + + + $(BuildToolset) + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + ..\..\lib\ + + + + + MultiThreadedDebugDLL + + + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/third_party/build/gsm/libgsmcodec.vcxproj b/third_party/build/gsm/libgsmcodec.vcxproj index bdbfb666e7..4409f2c9cf 100644 --- a/third_party/build/gsm/libgsmcodec.vcxproj +++ b/third_party/build/gsm/libgsmcodec.vcxproj @@ -1,732 +1,736 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {E53AA5FF-B737-40AA-BD13-387EFA99023D} - libgsmcodec - - en-US - - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - - $(BuildToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MultiThreadedDebugDLL - - - - <_ProjectFileVersion>14.0.22823.1 - ..\..\lib\ - - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - Level3 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - Level3 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - Level3 - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - Level3 - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - Level3 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - Level3 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - Level3 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - Level3 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - Level3 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - Level3 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - Level3 - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - Level3 - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - Level3 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - Level3 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - Level3 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - Level3 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - Level3 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - Level3 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - Level3 - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - Level3 - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - Level3 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - Level3 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - Level3 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../gsm/inc;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - Level3 - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {E53AA5FF-B737-40AA-BD13-387EFA99023D} + libgsmcodec + + en-US + SAK + SAK + SAK + SAK + + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + + $(BuildToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MultiThreadedDebugDLL + + + + <_ProjectFileVersion>14.0.22823.1 + ..\..\lib\ + + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + Level3 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + Level3 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + Level3 + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + Level3 + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + Level3 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + Level3 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + Level3 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + Level3 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + Level3 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + Level3 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + Level3 + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + Level3 + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + Level3 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + Level3 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + Level3 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + Level3 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + Level3 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + Level3 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + Level3 + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + Level3 + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + Level3 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + Level3 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + Level3 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../gsm/inc;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + Level3 + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/third_party/build/ilbc/libilbccodec.vcxproj b/third_party/build/ilbc/libilbccodec.vcxproj index 61302117fa..c766ad9ccb 100644 --- a/third_party/build/ilbc/libilbccodec.vcxproj +++ b/third_party/build/ilbc/libilbccodec.vcxproj @@ -1,706 +1,710 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} - libilbccodec - - en-US - - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - - $(BuildToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - ..\..\lib\ - - - - - MultiThreadedDebugDLL - - - - - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} + libilbccodec + + en-US + SAK + SAK + SAK + SAK + + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + + $(BuildToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + ..\..\lib\ + + + + + MultiThreadedDebugDLL + + + + + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/third_party/build/milenage/libmilenage.vcxproj b/third_party/build/milenage/libmilenage.vcxproj index de39899fce..3bb484d249 100644 --- a/third_party/build/milenage/libmilenage.vcxproj +++ b/third_party/build/milenage/libmilenage.vcxproj @@ -1,687 +1,691 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {4BF51C21-5A30-423B-82FE-1ED410E5769D} - libmilenage - - en-US - - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - - $(BuildToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - ..\..\lib\ - - - - - MultiThreadedDebugDLL - - - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - ../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - - - - - - - - + + + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {4BF51C21-5A30-423B-82FE-1ED410E5769D} + libmilenage + + en-US + SAK + SAK + SAK + SAK + + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + + $(BuildToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + ..\..\lib\ + + + + + MultiThreadedDebugDLL + + + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + ../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + + + + + + + + \ No newline at end of file diff --git a/third_party/build/resample/libresample.vcxproj b/third_party/build/resample/libresample.vcxproj index 36987d955b..98a1f9215f 100644 --- a/third_party/build/resample/libresample.vcxproj +++ b/third_party/build/resample/libresample.vcxproj @@ -1,689 +1,694 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {6794B975-4E84-4F49-B2DC-C31F2224E03E} - libresample - - en-US - - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - - $(BuildToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - ..\..\lib\ - - - - - MultiThreadedDebugDLL - - - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../resample/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - - - - - - - - - - + + + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {6794B975-4E84-4F49-B2DC-C31F2224E03E} + libresample + + en-US + SAK + SAK + SAK + SAK + + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + + $(BuildToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + ..\..\lib\ + + + + + MultiThreadedDebugDLL + + + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../resample/include;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/third_party/build/resample/libresample.vcxproj.filters b/third_party/build/resample/libresample.vcxproj.filters index 8b1f95a8eb..8d6809b2fb 100644 --- a/third_party/build/resample/libresample.vcxproj.filters +++ b/third_party/build/resample/libresample.vcxproj.filters @@ -1,35 +1,38 @@ - - - - - {3de1d236-2197-4711-9382-eeb868306030} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {e8afb0d8-7602-4bc2-999b-098090f01d12} - h;hpp;hxx;hm;inl - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Header Files - - - - - Source Files - - + + + + + {3de1d236-2197-4711-9382-eeb868306030} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {e8afb0d8-7602-4bc2-999b-098090f01d12} + h;hpp;hxx;hm;inl + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Header Files + + + Header Files + + + + + Source Files + + \ No newline at end of file diff --git a/third_party/build/speex/libspeex.vcxproj b/third_party/build/speex/libspeex.vcxproj index 2844041e75..d6cdec3e87 100644 --- a/third_party/build/speex/libspeex.vcxproj +++ b/third_party/build/speex/libspeex.vcxproj @@ -1,1254 +1,1262 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} - libspeex - - en-US - - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - - $(BuildToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - ..\..\lib\ - - - - - MultiThreadedDebugDLL - - - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} + libspeex + + en-US + SAK + SAK + SAK + SAK + + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + + $(BuildToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + ..\..\lib\ + + + + + MultiThreadedDebugDLL + + + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + MaxSpeed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/third_party/build/speex/libspeex.vcxproj.filters b/third_party/build/speex/libspeex.vcxproj.filters index 9e0ff99d3b..a756c052bd 100644 --- a/third_party/build/speex/libspeex.vcxproj.filters +++ b/third_party/build/speex/libspeex.vcxproj.filters @@ -1,248 +1,260 @@ - - - - - {6c1febad-435e-4461-82c5-19c9d7580f31} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {4188f201-4ec3-4263-b540-db2a64134296} - h;hpp;hxx;hm;inl - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - + + + + + {6c1febad-435e-4461-82c5-19c9d7580f31} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {4188f201-4ec3-4263-b540-db2a64134296} + h;hpp;hxx;hm;inl + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/third_party/build/srtp/libsrtp.vcxproj b/third_party/build/srtp/libsrtp.vcxproj index 7196d60915..72faeca547 100644 --- a/third_party/build/srtp/libsrtp.vcxproj +++ b/third_party/build/srtp/libsrtp.vcxproj @@ -1,781 +1,781 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858} - libsrtp - Win32Proj - - en-US - - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - StaticLibrary - v140 - MultiByte - - - - $(BuildToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - ..\..\lib\ - - - - - MultiThreadedDebugDLL - - - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - - - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858} + libsrtp + Win32Proj + + en-US + + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + StaticLibrary + v140 + MultiByte + + + + $(BuildToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + ..\..\lib\ + + + + + MultiThreadedDebugDLL + + + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/third_party/build/webrtc/libwebrtc.vcxproj b/third_party/build/webrtc/libwebrtc.vcxproj index 78a1c36cf4..70e6f33a8d 100644 --- a/third_party/build/webrtc/libwebrtc.vcxproj +++ b/third_party/build/webrtc/libwebrtc.vcxproj @@ -1,798 +1,802 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - SSE - SSE - NEON - NEON - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {5BCF2773-3825-4D91-9D72-3E2F650DF1DB} - libwebrtc - - en-US - - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - - $(BuildToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.24730.2 - ..\..\lib\ - - - - - MultiThreadedDebugDLL - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_HAS_NEON;WEBRTC_ARCH_ARM64;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_HAS_NEON;WEBRTC_ARCH_ARM64;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_HAS_NEON;WEBRTC_ARCH_ARM64;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_HAS_NEON;WEBRTC_ARCH_ARM64;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_HAS_NEON;WEBRTC_ARCH_ARM64;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../webrtc/src;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_HAS_NEON;WEBRTC_ARCH_ARM64;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - + + + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + SSE + SSE + NEON + NEON + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {5BCF2773-3825-4D91-9D72-3E2F650DF1DB} + libwebrtc + + en-US + SAK + SAK + SAK + SAK + + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + + $(BuildToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.24730.2 + ..\..\lib\ + + + + + MultiThreadedDebugDLL + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_HAS_NEON;WEBRTC_ARCH_ARM64;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_HAS_NEON;WEBRTC_ARCH_ARM64;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_HAS_NEON;WEBRTC_ARCH_ARM64;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_HAS_NEON;WEBRTC_ARCH_ARM64;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_HAS_NEON;WEBRTC_ARCH_ARM64;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_HAS_NEON;WEBRTC_ARCH_ARM64;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + \ No newline at end of file diff --git a/third_party/build/webrtc/libwebrtc.vcxproj.filters b/third_party/build/webrtc/libwebrtc.vcxproj.filters index 181affd313..0bf799deb1 100755 --- a/third_party/build/webrtc/libwebrtc.vcxproj.filters +++ b/third_party/build/webrtc/libwebrtc.vcxproj.filters @@ -1,279 +1,264 @@ - - - - - {d1521b07-9b1c-41b7-b6f2-848cf25559b4} - - - {9d5ef30c-9759-4e25-8586-28896609c552} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - + + + + + {d1521b07-9b1c-41b7-b6f2-848cf25559b4} + + + {9d5ef30c-9759-4e25-8586-28896609c552} + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + \ No newline at end of file diff --git a/third_party/build/webrtc_aec3/libwebrtc_aec3.vcxproj b/third_party/build/webrtc_aec3/libwebrtc_aec3.vcxproj index 3319498cc2..b53ed133ac 100755 --- a/third_party/build/webrtc_aec3/libwebrtc_aec3.vcxproj +++ b/third_party/build/webrtc_aec3/libwebrtc_aec3.vcxproj @@ -104,7 +104,7 @@ SSE NEON NEON - + @@ -268,6 +268,10 @@ libwebrtc_aec3 en-US + SAK + SAK + SAK + SAK diff --git a/third_party/build/webrtc_aec3/libwebrtc_aec3.vcxproj.filters b/third_party/build/webrtc_aec3/libwebrtc_aec3.vcxproj.filters index 977cfd59cd..d0b381cbaf 100755 --- a/third_party/build/webrtc_aec3/libwebrtc_aec3.vcxproj.filters +++ b/third_party/build/webrtc_aec3/libwebrtc_aec3.vcxproj.filters @@ -512,11 +512,14 @@ Source Files\modules\audio_processing\aec3 - - Source Files\common_audio\resampler - - - Source Files\third_party - + + + + + + + + + \ No newline at end of file diff --git a/third_party/build/yuv/libyuv.vcxproj b/third_party/build/yuv/libyuv.vcxproj index 4814cc9022..ea8841bb83 100644 --- a/third_party/build/yuv/libyuv.vcxproj +++ b/third_party/build/yuv/libyuv.vcxproj @@ -1,733 +1,757 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {6AC9B65F-0862-4A5C-8A9D-141516993130} - libyuv - - en-US - - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - StaticLibrary - v140 - false - MultiByte - - - - $(BuildToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.24730.2 - ..\..\lib\ - - - - - MultiThreadedDebugDLL - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - false - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - false - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - X64 - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - /wd4100 /wd4244 /wd4127 %(AdditionalOptions) - .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - - - Default - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {6AC9B65F-0862-4A5C-8A9D-141516993130} + libyuv + + en-US + SAK + SAK + SAK + SAK + + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + + $(BuildToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.24730.2 + ..\..\lib\ + + + + + MultiThreadedDebugDLL + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + false + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + false + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + ProgramDatabase + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + X64 + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + + + Default + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/third_party/build/yuv/libyuv.vcxproj.filters b/third_party/build/yuv/libyuv.vcxproj.filters index 2ec88788da..538a370ca2 100644 --- a/third_party/build/yuv/libyuv.vcxproj.filters +++ b/third_party/build/yuv/libyuv.vcxproj.filters @@ -1,104 +1,164 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + \ No newline at end of file From 81996e652ee4f9032da0b7f13496cbe11822200f Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Sun, 20 Oct 2024 19:43:53 +0200 Subject: [PATCH 02/33] stack implementation and tests --- pjlib/include/pj/compat/cc_gcc.h | 55 ++++++----- pjlib/include/pj/compat/cc_msvc.h | 45 +++++---- pjlib/include/pj/stack.h | 119 +++++++++++++++++++++++ pjlib/include/pj/types.h | 12 +++ pjlib/include/pjlib.h | 1 + pjlib/src/pj/stack.c | 156 ++++++++++++++++++++++++++++++ pjlib/src/pj/stack_win32.c | 112 +++++++++++++++++++++ pjlib/src/pjlib-test/stack.c | 155 +++++++++++++++++++++++++++++ pjlib/src/pjlib-test/test.c | 12 +++ pjlib/src/pjlib-test/test.h | 2 + 10 files changed, 626 insertions(+), 43 deletions(-) create mode 100644 pjlib/include/pj/stack.h create mode 100644 pjlib/src/pj/stack.c create mode 100644 pjlib/src/pj/stack_win32.c create mode 100644 pjlib/src/pjlib-test/stack.c diff --git a/pjlib/include/pj/compat/cc_gcc.h b/pjlib/include/pj/compat/cc_gcc.h index 1acf692ccd..5709aabbac 100644 --- a/pjlib/include/pj/compat/cc_gcc.h +++ b/pjlib/include/pj/compat/cc_gcc.h @@ -28,52 +28,57 @@ # error "This file is only for gcc!" #endif -#define PJ_CC_NAME "gcc" -#define PJ_CC_VER_1 __GNUC__ -#define PJ_CC_VER_2 __GNUC_MINOR__ +#define PJ_CC_NAME "gcc" +#define PJ_CC_VER_1 __GNUC__ +#define PJ_CC_VER_2 __GNUC_MINOR__ /* __GNUC_PATCHLEVEL__ doesn't exist in gcc-2.9x.x */ #ifdef __GNUC_PATCHLEVEL__ -# define PJ_CC_VER_3 __GNUC_PATCHLEVEL__ +# define PJ_CC_VER_3 __GNUC_PATCHLEVEL__ #else -# define PJ_CC_VER_3 0 +# define PJ_CC_VER_3 0 #endif -#define PJ_THREAD_FUNC -#define PJ_NORETURN +#define PJ_THREAD_FUNC +#define PJ_NORETURN -#define PJ_HAS_INT64 1 +#define PJ_HAS_INT64 1 #ifdef __STRICT_ANSI__ #include - typedef int64_t pj_int64_t; - typedef uint64_t pj_uint64_t; - #define PJ_INLINE_SPECIFIER static __inline - #define PJ_ATTR_NORETURN - #define PJ_ATTR_MAY_ALIAS + typedef int64_t pj_int64_t; + typedef uint64_t pj_uint64_t; + #define PJ_INLINE_SPECIFIER static __inline + #define PJ_ATTR_NORETURN + #define PJ_ATTR_MAY_ALIAS #else - typedef long long pj_int64_t; - typedef unsigned long long pj_uint64_t; - #define PJ_INLINE_SPECIFIER static inline - #define PJ_ATTR_NORETURN __attribute__ ((noreturn)) - #define PJ_ATTR_MAY_ALIAS __attribute__((__may_alias__)) + typedef long long pj_int64_t; + typedef unsigned long long pj_uint64_t; + #define PJ_INLINE_SPECIFIER static inline + #define PJ_ATTR_NORETURN __attribute__ ((noreturn)) + #define PJ_ATTR_MAY_ALIAS __attribute__((__may_alias__)) #endif -#define PJ_INT64(val) val##LL -#define PJ_UINT64(val) val##ULL -#define PJ_INT64_FMT "L" +#define PJ_INT64(val) val##LL +#define PJ_UINT64(val) val##ULL +#define PJ_INT64_FMT "L" #ifdef __GLIBC__ -# define PJ_HAS_BZERO 1 +# define PJ_HAS_BZERO 1 #endif -#define PJ_UNREACHED(x) +#define PJ_UNREACHED(x) -#define PJ_ALIGN_DATA(declaration, alignment) declaration __attribute__((aligned (alignment))) +//#define PJ_ALIGN_DATA(declaration, alignment) declaration __attribute__((aligned (alignment))) +#define PJ_ALIGN_DATA_PREFIX(alignment) +#define PJ_ALIGN_DATA_SUFFIX(alignment) __attribute__((aligned (alignment))) +#define PJ_ALIGN_DATA(declaration, alignment) PJ_ALIGN_DATA_PREFIX(alignment) declaration PJ_ALIGN_DATA_SUFFIX(alignment) +#define PJ_SYS_ALIGN_PREFIX +#define PJ_SYS_ALIGN_SUFFIX -#endif /* __PJ_COMPAT_CC_GCC_H__ */ +#endif /* __PJ_COMPAT_CC_GCC_H__ */ diff --git a/pjlib/include/pj/compat/cc_msvc.h b/pjlib/include/pj/compat/cc_msvc.h index f35e002972..a322f19c0a 100644 --- a/pjlib/include/pj/compat/cc_msvc.h +++ b/pjlib/include/pj/compat/cc_msvc.h @@ -28,10 +28,10 @@ # error "This header file is only for Visual C compiler!" #endif -#define PJ_CC_NAME "msvc" -#define PJ_CC_VER_1 (_MSC_VER/100) -#define PJ_CC_VER_2 (_MSC_VER%100) -#define PJ_CC_VER_3 0 +#define PJ_CC_NAME "msvc" +#define PJ_CC_VER_1 (_MSC_VER/100) +#define PJ_CC_VER_2 (_MSC_VER%100) +#define PJ_CC_VER_3 0 /* Disable CRT deprecation warnings. */ #if PJ_CC_VER_1 >= 8 && !defined(_CRT_SECURE_NO_DEPRECATE) @@ -55,33 +55,42 @@ #endif #ifdef __cplusplus -# define PJ_INLINE_SPECIFIER inline +# define PJ_INLINE_SPECIFIER inline #else -# define PJ_INLINE_SPECIFIER static __inline +# define PJ_INLINE_SPECIFIER static __inline #endif #define PJ_EXPORT_DECL_SPECIFIER __declspec(dllexport) -#define PJ_EXPORT_DEF_SPECIFIER __declspec(dllexport) +#define PJ_EXPORT_DEF_SPECIFIER __declspec(dllexport) #define PJ_IMPORT_DECL_SPECIFIER __declspec(dllimport) -#define PJ_THREAD_FUNC -#define PJ_NORETURN __declspec(noreturn) -#define PJ_ATTR_NORETURN -#define PJ_ATTR_MAY_ALIAS +#define PJ_THREAD_FUNC +#define PJ_NORETURN __declspec(noreturn) +#define PJ_ATTR_NORETURN +#define PJ_ATTR_MAY_ALIAS -#define PJ_HAS_INT64 1 +#define PJ_HAS_INT64 1 typedef __int64 pj_int64_t; typedef unsigned __int64 pj_uint64_t; -#define PJ_INT64(val) val##i64 -#define PJ_UINT64(val) val##ui64 -#define PJ_INT64_FMT "I64" +#define PJ_INT64(val) val##i64 +#define PJ_UINT64(val) val##ui64 +#define PJ_INT64_FMT "I64" -#define PJ_UNREACHED(x) +#define PJ_UNREACHED(x) -#define PJ_ALIGN_DATA(declaration, alignment) __declspec(align(alignment)) declaration +//#define PJ_ALIGN_DATA(declaration, alignment) __declspec(align(alignment)) declaration +//#pragma warning(disable:4324) // structure padded due to align() +//#define PJ_ALIGN_DATA(declaration, alignment) __pragma(warning(push)) __pragma(warning(disable:4324)) __declspec(align(alignment)) declaration __pragma(warning(pop)) +#define PJ_ALIGN_DATA_PREFIX(alignment) __pragma(warning(push)) __pragma(warning(disable:4324)) __declspec(align(alignment)) +#define PJ_ALIGN_DATA_SUFFIX(alignment) __pragma(warning(pop)) +#define PJ_ALIGN_DATA(declaration, alignment) PJ_ALIGN_DATA_PREFIX(alignment) declaration PJ_ALIGN_DATA_SUFFIX(alignment) +//please add #include into your config_site.h if macro bellow is not compilable +#define PJ_SYS_ALIGN_PREFIX PJ_ALIGN_DATA_PREFIX(MEMORY_ALLOCATION_ALIGNMENT) +#define PJ_SYS_ALIGN_SUFFIX PJ_ALIGN_DATA_SUFFIX(MEMORY_ALLOCATION_ALIGNMENT) -#endif /* __PJ_COMPAT_CC_MSVC_H__ */ + +#endif /* __PJ_COMPAT_CC_MSVC_H__ */ diff --git a/pjlib/include/pj/stack.h b/pjlib/include/pj/stack.h new file mode 100644 index 0000000000..ef83fb0e56 --- /dev/null +++ b/pjlib/include/pj/stack.h @@ -0,0 +1,119 @@ +#ifndef __PJ_STACK_H__ +#define __PJ_STACK_H__ + +/** + * @file stack.h + * @brief Single Linked List data structure. + */ + +#include + +PJ_BEGIN_DECL + +/* + * @defgroup PJ_DS Data Structure. + */ + +/** + * @defgroup PJ_STACK Single Linked List with FILO in/out policy + * @ingroup PJ_DS + * @{ + * + * Stack in PJLIB is single-linked list with First In Last Out logic. + * Stack is thread safe. Common PJLIB stack implementation uses internal locking mechanism so is thread-safe. + * Implementation for Windows platform uses locking free Windows embeded single linked list implementation. + * Windows single linked list implementation requires aligned data, both stack item and stack itself should + * be aligned by 8 (for x86) or 16 (for x64) byte. We recomend set PJ_POOL_ALIGNMENT macro to corresponding value. + * winnt.h define MEMORY_ALLOCATION_ALIGNMENT macro for this purpose. + * Stack won't require dynamic memory allocation (just as all PJLIB data structures). The stack here + * should be viewed more like a low level C stack instead of high level C++ stack + * (which normally are easier to use but require dynamic memory allocations), + * therefore all caveats with C stack apply here too (such as you can NOT put + * a node in more than one stacks). + * + * \section pj_stack_example_sec Examples + * + * See below for examples on how to manipulate stack: + * - @ref page_pjlib_stack_test + */ + + +#define IS_ALIGNED_PTR(PTR,ALIGNMENT) (((pj_ssize_t)(void*)(PTR) % (ALIGNMENT)) == 0) + + +/** + * Use this macro in the start of the structure declaration to declare that + * the structure can be used in the stack operation. This macro simply + * declares additional member @a next to the structure. + * @hideinitializer + */ +#define PJ_DECL_STACK_MEMBER(type) \ + /** Stack @a next. */ \ + type *next + + +/** + * Create the stack: allocate memory, allocate and initialize OS resources. + * Initially, the stack will have no member, and function pj_stack_pop() will + * always return NULL (which indicates there are no any items in the stack currently) for the newly initialized + * stack. + * + * @param pool Pool to allocate memory from. + * @param stack The stack head. + * + * @return PJ_SUCCESS or the appropriate error code. + */ +PJ_DECL(pj_status_t) pj_stack_create(pj_pool_t *pool, pj_stack_type **stack); + +/** + * Free OS resources allocated by pj_stack_create(). + * + * @param stack The target stack. + * + * @return PJ_SUCCESS or the appropriate error code. + */ +PJ_DECL(pj_status_t) pj_stack_destroy(pj_stack_type *stack); + + +/** + * Insert (push) the node to the front of the stack as atomic (thread safe) operation. + * + * @param stack The stack. + * @param node The element to be inserted. + * + * @return PJ_SUCCESS or the appropriate error code. + */ +PJ_DECL(pj_status_t) pj_stack_push(pj_stack_type *stack, pj_stack_t *node); + + +/** + * Extract (pop) element from the front of the stack (removing it from the stack) as atomic (thread safe) operation. + * + * @param stack The target stack. + * + * @return NULL if the stack is empty, or else pointer to element extracted from stack. + */ +PJ_DECL(pj_stack_t*) pj_stack_pop(pj_stack_type *stack); + +/** + * Traverse the stack and get it's elements quantity. + * The return value of pj_stack_size should not be relied upon in multithreaded applications + * because the item count can be changed at any time by another thread. + * For Windows platform returns the number of entries in the stack modulo 65535. For example, + * if the specified stack contains 65536 entries, pj_stack_size returns zero. + * + * @param stack The target stack. + * + * @return Number of elements. + */ +PJ_DEF(pj_size_t) pj_stack_size(/*const*/ pj_stack_type *stack); + + +/** + * @} + */ + +PJ_END_DECL + +#endif /* __PJ_STACK_H__ */ + diff --git a/pjlib/include/pj/types.h b/pjlib/include/pj/types.h index cdee0797be..7dbc4a49da 100644 --- a/pjlib/include/pj/types.h +++ b/pjlib/include/pj/types.h @@ -195,6 +195,18 @@ typedef struct pj_hash_iterator_t pj_hash_entry *entry; /**< Internal entry. */ } pj_hash_iterator_t; +/** + * The opaque data type for stack, which is used as arguments throughout + * the stack operations. + */ +typedef struct pj_stack_type pj_stack_type; + +/** + * The opaque data type for stack item, which is used as item argument throughout + * the stack operations. + * Real stack's item should have PJ_DECL_STACK_MEMBER(type) as the first member. + */ +typedef void pj_stack_t; /** * Forward declaration for memory pool factory. diff --git a/pjlib/include/pjlib.h b/pjlib/include/pjlib.h index eb9e757842..f5988255f9 100644 --- a/pjlib/include/pjlib.h +++ b/pjlib/include/pjlib.h @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include diff --git a/pjlib/src/pj/stack.c b/pjlib/src/pj/stack.c new file mode 100644 index 0000000000..046d1c50a6 --- /dev/null +++ b/pjlib/src/pj/stack.c @@ -0,0 +1,156 @@ +#include +#include +#include +#include +#include +#include + +#ifdef PJ_WIN32 +#error stack.c should NOT be compiled for Windows platform (compile stack_win32.c instead) +#endif // PJ_WIN32 + +#include + +#define THIS_FILE "stack.c" + +/** + * This structure describes generic stack node and stack. The owner of this stack + * must initialize the 'value' member to an appropriate value (typically the + * owner itself). + */ +typedef struct pj_stack_item_t +{ + PJ_DECL_STACK_MEMBER(void); +} PJ_ATTR_MAY_ALIAS pj_stack_item_t; /* may_alias avoids warning with gcc-4.4 -Wall -O2 */ + + +struct pj_stack_type +{ + pj_stack_item_t head; + pj_mutex_t* mutex; +}; + +PJ_DEF(pj_status_t) pj_stack_create(pj_pool_t *pool, pj_stack_type **stack) +{ + pj_stack_type* p_stack; + pj_status_t rc; + + PJ_ASSERT_RETURN(pool && stack, PJ_EINVAL); + + p_stack = PJ_POOL_ZALLOC_T(pool, pj_stack_type); + if (!p_stack) + return PJ_ENOMEM; + + char name[PJ_MAX_OBJ_NAME]; + /* Set name. */ + pj_ansi_snprintf(name, PJ_MAX_OBJ_NAME, "stc%p", p_stack); + + rc = pj_mutex_create_simple(pool, name, &p_stack->mutex); + if (rc != PJ_SUCCESS) + return rc; + + + p_stack->head.next = &p_stack->head; + *stack = p_stack; + + PJ_LOG(6, (THIS_FILE, "Stack created stc%p", p_stack)); + return PJ_SUCCESS; + +} + + +PJ_DEF(pj_status_t) pj_stack_destroy(pj_stack_type *stack) +{ + PJ_ASSERT_RETURN(stack, PJ_EINVAL); + pj_status_t rc; + rc = pj_mutex_destroy(stack->mutex); + if (rc == PJ_SUCCESS) + { + PJ_LOG(6, (THIS_FILE, "Stack destroyed stc%p", stack)); + } + return rc; +} + + +PJ_DEF(pj_status_t) pj_stack_push(pj_stack_type *stack, pj_stack_t *node) +{ + PJ_ASSERT_RETURN(node && stack, PJ_EINVAL); + pj_status_t status; + if ((status = pj_mutex_lock(stack->mutex)) != PJ_SUCCESS) + { + PJ_PERROR(1, ("pj_stack_push", status, "Error locking mutex for stack stc%p", stack)); + return status; + } + ((pj_stack_item_t*)node)->next = stack->head.next; + stack->head.next = node; + if ((status = pj_mutex_unlock(stack->mutex)) != PJ_SUCCESS) + { + PJ_PERROR(1, ("pj_stack_push", status, "Error unlocking mutex for stack stc%p", stack)); + } + return status; +} + + +PJ_DEF(pj_stack_t*) pj_stack_pop(pj_stack_type *stack) +{ + PJ_ASSERT_RETURN(stack, NULL); + pj_status_t status; + if ((status = pj_mutex_lock(stack->mutex)) != PJ_SUCCESS) + { + PJ_PERROR(1, ("pj_stack_pop", status, "Error locking mutex for stack stc%p", stack)); + return NULL; + } + + pj_stack_item_t* node = stack->head.next; + stack->head.next = node->next; + + if ((status = pj_mutex_unlock(stack->mutex)) != PJ_SUCCESS) + { + PJ_PERROR(1, ("pj_stack_pop", status, "Error unlocking mutex for stack stc%p", stack)); + } + if (node != node->next) + { + node->next = NULL; + return node; + } + else + return NULL; +} + + +/** + * Traverse the stack and get it's elements quantity. + * The return value of pj_stack_size should not be relied upon in multithreaded applications + * because the item count can be changed at any time by another thread. + * For Windows platform returns the number of entries in the stack modulo 65535. For example, + * if the specified stack contains 65536 entries, pj_stack_size returns zero. + * + * @param stack The target stack. + * + * @return Number of elements. + */ +PJ_DEF(pj_size_t) pj_stack_size(/*const*/ pj_stack_type *stack) +{ + PJ_ASSERT_RETURN(stack, 0); + pj_status_t status; + if ((status = pj_mutex_lock(stack->mutex)) != PJ_SUCCESS) + { + PJ_PERROR(1, ("pj_stack_size", status, "Error locking mutex for stack stc%p", stack)); + return 0; + } + + const pj_stack_item_t* node = stack->head.next; + pj_size_t count = 0; + + while (node != node->next) { + ++count; + node = node->next; + } + + if ((status = pj_mutex_unlock(stack->mutex)) != PJ_SUCCESS) + { + PJ_PERROR(1, ("pj_stack_size", status, "Error unlocking mutex for stack stc%p", stack)); + } + + return count; +} diff --git a/pjlib/src/pj/stack_win32.c b/pjlib/src/pj/stack_win32.c new file mode 100644 index 0000000000..c498fe4084 --- /dev/null +++ b/pjlib/src/pj/stack_win32.c @@ -0,0 +1,112 @@ +#include +#include +#include +#include +#include +#include + +#ifndef PJ_WIN32 +#error stack_win32.c should be compiled �nly for Windows platform +#endif // PJ_WIN32 + +#include + +#include + +#define THIS_FILE "stack_win32.c" + +#if PJ_POOL_ALIGNMENT < MEMORY_ALLOCATION_ALIGNMENT +#error pj_stack implementation for Windows platform required PJ_POOL_ALIGNMENT macro set to value not less then MEMORY_ALLOCATION_ALIGNMENT \ + (platform dependent constant declared in winnt.h) \ + please add next line to your config_site.h file: #define PJ_POOL_ALIGNMENT MEMORY_ALLOCATION_ALIGNMENT\ + for this you may also need to #include into config_site.h +#endif + +struct pj_stack_type +{ + SLIST_HEADER head; +}; + + +PJ_DEF(pj_status_t) pj_stack_create(pj_pool_t *pool, pj_stack_type **stack) +{ + + PJ_ASSERT_RETURN(pool && stack, PJ_EINVAL); + + pj_stack_type* p_stack = PJ_POOL_ALLOC_T(pool, pj_stack_type); + if (!p_stack) + return PJ_ENOMEM; + + PJ_ASSERT_ON_FAIL(IS_ALIGNED_PTR(&p_stack->head, MEMORY_ALLOCATION_ALIGNMENT), { + PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, p_stack)); + return PJ_EINVALIDOP; + }); + + InitializeSListHead(&p_stack->head); + + *stack = p_stack; + PJ_LOG(6, (THIS_FILE, "Stack created stc%p", p_stack)); + return PJ_SUCCESS; + +} + + +PJ_DEF(pj_status_t) pj_stack_destroy(pj_stack_type *stack) +{ + PJ_ASSERT_RETURN(stack, PJ_EINVAL); + //nothing to do here + PJ_LOG(6, (THIS_FILE, "Stack destroyed stc%p", stack)); + return PJ_SUCCESS; +} + + +PJ_DEF(pj_status_t) pj_stack_push(pj_stack_type *stack, pj_stack_t *node) +{ + PJ_ASSERT_RETURN(node && stack, PJ_EINVAL); + + PJ_ASSERT_ON_FAIL( IS_ALIGNED_PTR(&stack->head, MEMORY_ALLOCATION_ALIGNMENT) && + IS_ALIGNED_PTR(node, MEMORY_ALLOCATION_ALIGNMENT), + { + PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, stack)); + return PJ_EINVALIDOP; + }); + + /*pFirstEntry =*/ InterlockedPushEntrySList(&stack->head, node); + return PJ_SUCCESS; +} + + +PJ_DEF(pj_stack_t*) pj_stack_pop(pj_stack_type *stack) +{ + PJ_ASSERT_RETURN(stack, NULL); + PJ_ASSERT_ON_FAIL(IS_ALIGNED_PTR(&stack->head, MEMORY_ALLOCATION_ALIGNMENT), + { + PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, stack)); + return NULL; + }); + + return InterlockedPopEntrySList(&stack->head); +} + +/** + * Get the stack's elements quantity. + * The return value of pj_stack_size should not be relied upon in multithreaded applications + * because the item count can be changed at any time by another thread. + * For Windows platform returns the number of entries in the stack modulo 65535. For example, + * if the specified stack contains 65536 entries, pj_stack_size returns zero. + * + * @param stack The target stack. + * + * @return Number of elements. + */ +PJ_DEF(pj_size_t) pj_stack_size(/*const*/ pj_stack_type *stack) +{ + PJ_ASSERT_RETURN(stack, 0); + PJ_ASSERT_ON_FAIL(IS_ALIGNED_PTR(&stack->head, MEMORY_ALLOCATION_ALIGNMENT), + { + PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, stack)); + return 0; + }); + + return QueryDepthSList(&stack->head); +} diff --git a/pjlib/src/pjlib-test/stack.c b/pjlib/src/pjlib-test/stack.c new file mode 100644 index 0000000000..5f34dd344b --- /dev/null +++ b/pjlib/src/pjlib-test/stack.c @@ -0,0 +1,155 @@ +#include "test.h" + + /** + * \page page_pjlib_stack_test Test: Stack + * + * This file provides implementation of \b stack_test(). It tests the + * functionality of the stack API. + * + * \section stack_test_sec Scope of the Test + * + * API tested: + * - pj_stack_create() + * - pj_stack_push() + * - pj_stack_pop() + * - pj_stack_destroy() + * + * + * This file is pjlib-test/stack.c + * + * \include pjlib-test/stack.c + */ + +#if INCLUDE_STACK_TEST + +#include + +#ifdef PJ_WIN32 + +#if !defined(MEMORY_ALLOCATION_ALIGNMENT) +#include +#endif //MEMORY_ALLOCATION_ALIGNMENT + +#endif // PJ_WIN32 + +typedef struct PJ_SYS_ALIGN_PREFIX stack_node { + PJ_DECL_STACK_MEMBER(struct stack_node); + int value; +} PJ_SYS_ALIGN_SUFFIX stack_node; + +int stack_test() +{ + pj_stack_type* stack = NULL; + const int sz = 15; + stack_node* nodes; + stack_node* p; + int i; // don't change to unsigned! + + pj_pool_t* pool = NULL;; + pj_status_t status; + int rc; + + pool = pj_pool_create(mem, NULL, 4096, 0, NULL); + if (!pool) + { + rc = -10; + goto error; + } + + nodes = pj_pool_calloc(pool, sz, sizeof(stack_node)); + if (!nodes) + { + rc = -15; + goto error; + } + +#ifdef PJ_WIN32 + +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4324) // structure padded due to align() +#endif // defined(_MSC_VER) + + if (TYPE_ALIGNMENT(stack_node) < MEMORY_ALLOCATION_ALIGNMENT) + { + //#error alignment of array's items used as stack node under Windows platform should not be less than MEMORY_ALLOCATION_ALIGNMENT + rc = -3; + goto error; + } + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif // defined(_MSC_VER) + + for (i = 0; i < sz; ++i) { + if (!IS_ALIGNED_PTR(&nodes[i], MEMORY_ALLOCATION_ALIGNMENT)) + { + rc = -7; + goto error; + } + } + +#endif // PJ_WIN32 + + //const char* stack_test = "stack_test"; + // test stack_create() + if ((status = pj_stack_create(pool, /*stack_test,*/ &stack)) != PJ_SUCCESS) + { + rc = -20; + goto error; + } + + // created stack is empty + if (pj_stack_pop(stack)) + { + rc = -25; + goto error; + } + + // Test push(). + for (i = 0; i < sz; ++i) { + nodes[i].value = i; + if ((status= pj_stack_push(stack, &nodes[i])) != PJ_SUCCESS) + { + rc = -30; + goto error; + } + } + + // test pop(). + while((p = pj_stack_pop(stack)) != NULL) { + --i; + pj_assert(p->value == i); //FILO ! + if (p->value != i || p != nodes + i) { + { + rc = -40; + goto error; + } + } + } + if (i) + { + rc = -50; + goto error; + } + rc = 0; +error: + if (stack != NULL && pj_stack_destroy(stack) != PJ_SUCCESS && !rc) + { + rc = -55; + } + + if (pool) + pj_pool_release(pool); + + return rc; +} + +#else + /* To prevent warning about "translation unit is empty" + * when this test is disabled. + */ +int dummy_stack_test; +#endif /* INCLUDE_STACK_TEST */ + + diff --git a/pjlib/src/pjlib-test/test.c b/pjlib/src/pjlib-test/test.c index 177b55aa19..2be316a000 100644 --- a/pjlib/src/pjlib-test/test.c +++ b/pjlib/src/pjlib-test/test.c @@ -68,6 +68,18 @@ int test_inner(void) pj_log_set_level(3); pj_log_set_decor(param_log_decor); +#if 0 + unsigned decor = pj_log_get_decor(); + pj_log_set_decor(PJ_LOG_HAS_THREAD_ID | PJ_LOG_HAS_SENDER | decor); + pj_log_set_level(5); +#if defined(PJ_STRERROR_USE_WIN_GET_THREAD_LOCALE) && (PJ_STRERROR_USE_WIN_GET_THREAD_LOCALE==1) && (WINVER >= 0x0500) + LCID locale = GetThreadLocale(); + BOOL res = SetThreadLocale(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT)); + PJ_UNUSED_ARG(res); +#endif +#endif + + rc = pj_init(); if (rc != 0) { app_perror("pj_init() error!!", rc); diff --git a/pjlib/src/pjlib-test/test.h b/pjlib/src/pjlib-test/test.h index 226a71bf84..50fd648bdf 100644 --- a/pjlib/src/pjlib-test/test.h +++ b/pjlib/src/pjlib-test/test.h @@ -44,6 +44,7 @@ #define INCLUDE_EXCEPTION_TEST GROUP_LIBC #define INCLUDE_RAND_TEST GROUP_LIBC #define INCLUDE_LIST_TEST GROUP_DATA_STRUCTURE +#define INCLUDE_STACK_TEST GROUP_DATA_STRUCTURE #define INCLUDE_HASH_TEST GROUP_DATA_STRUCTURE #define INCLUDE_POOL_TEST GROUP_LIBC #define INCLUDE_POOL_PERF_TEST (GROUP_LIBC && WITH_BENCHMARK) @@ -87,6 +88,7 @@ extern int timestamp_test(void); extern int exception_test(void); extern int rand_test(void); extern int list_test(void); +extern int stack_test(void); extern int hash_test(void); extern int log_test(void); extern int os_test(void); From b2ab4729320fb9eab149e43afa7ac77e9fe66f54 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Sun, 20 Oct 2024 22:48:31 +0200 Subject: [PATCH 03/33] code style fix --- pjlib/src/pj/stack.c | 10 +++++----- pjlib/src/pjlib-test/stack.c | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pjlib/src/pj/stack.c b/pjlib/src/pj/stack.c index 046d1c50a6..28da622e81 100644 --- a/pjlib/src/pj/stack.c +++ b/pjlib/src/pj/stack.c @@ -26,14 +26,14 @@ typedef struct pj_stack_item_t struct pj_stack_type { - pj_stack_item_t head; - pj_mutex_t* mutex; + pj_stack_item_t head; + pj_mutex_t *mutex; }; PJ_DEF(pj_status_t) pj_stack_create(pj_pool_t *pool, pj_stack_type **stack) { - pj_stack_type* p_stack; - pj_status_t rc; + pj_stack_type *p_stack; + pj_status_t rc; PJ_ASSERT_RETURN(pool && stack, PJ_EINVAL); @@ -139,7 +139,7 @@ PJ_DEF(pj_size_t) pj_stack_size(/*const*/ pj_stack_type *stack) return 0; } - const pj_stack_item_t* node = stack->head.next; + const pj_stack_item_t *node = stack->head.next; pj_size_t count = 0; while (node != node->next) { diff --git a/pjlib/src/pjlib-test/stack.c b/pjlib/src/pjlib-test/stack.c index 5f34dd344b..2f6008ac87 100644 --- a/pjlib/src/pjlib-test/stack.c +++ b/pjlib/src/pjlib-test/stack.c @@ -39,15 +39,15 @@ typedef struct PJ_SYS_ALIGN_PREFIX stack_node { int stack_test() { - pj_stack_type* stack = NULL; - const int sz = 15; - stack_node* nodes; - stack_node* p; + pj_stack_type *stack = NULL; + const int sz = 15; + stack_node *nodes; + stack_node *p; int i; // don't change to unsigned! - pj_pool_t* pool = NULL;; - pj_status_t status; - int rc; + pj_pool_t *pool = NULL;; + pj_status_t status; + int rc; pool = pj_pool_create(mem, NULL, 4096, 0, NULL); if (!pool) From 79062c189ee08ba834b8d8b59cdee73b0f8ca384 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Sun, 27 Oct 2024 17:20:44 +0100 Subject: [PATCH 04/33] fix to Added more logs (#4098) --- pjlib/src/pj/os_core_win32.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pjlib/src/pj/os_core_win32.c b/pjlib/src/pj/os_core_win32.c index 4eb8c00fd1..183bdce7c1 100644 --- a/pjlib/src/pj/os_core_win32.c +++ b/pjlib/src/pj/os_core_win32.c @@ -54,7 +54,18 @@ #else # define LOG_MUTEX(expr) PJ_LOG(6,expr) #endif -# define LOG_MUTEX_WARN(expr) PJ_LOG(3,expr) +/* + * To compile construction such as the next: + * + * LOG_MUTEX_WARN((mutex->obj_name, status, + * "Failed to acquire mutex by thread %s", + * pj_thread_this()->obj_name)); + * + * We should redefine LOG_MUTEX_WARN macro using PJ_PERROR, instead of PJ_LOG + * + * # define LOG_MUTEX_WARN(expr) PJ_LOG(3,expr) +*/ +# define LOG_MUTEX_WARN(expr) PJ_PERROR(3,expr) #define THIS_FILE "os_core_win32.c" /* @@ -119,7 +130,7 @@ struct pj_event_t */ struct pj_atomic_t { - long value; + long value; }; /* From 267e1e00c22032d74d7647db1666795386bc4e01 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Sat, 26 Oct 2024 01:03:42 +0200 Subject: [PATCH 05/33] remove Debug-Dynamic-Client and Release-Dynamic-Client configurations --- pjmedia/build/pjmedia.vcxproj | 221 ------------------------ pjmedia/build/pjmedia.vcxproj.filters | 6 - pjsip-apps/build/libpjproject.vcxproj | 236 ------------------------- pjsip/build/pjsua_lib.vcxproj | 238 -------------------------- pjsip/build/pjsua_lib.vcxproj.filters | 9 - 5 files changed, 710 deletions(-) diff --git a/pjmedia/build/pjmedia.vcxproj b/pjmedia/build/pjmedia.vcxproj index ab2aed9f63..17b7536a87 100644 --- a/pjmedia/build/pjmedia.vcxproj +++ b/pjmedia/build/pjmedia.vcxproj @@ -1,22 +1,6 @@  - - Debug-Dynamic-Client - ARM - - - Debug-Dynamic-Client - ARM64 - - - Debug-Dynamic-Client - Win32 - - - Debug-Dynamic-Client - x64 - Debug-Dynamic ARM @@ -65,22 +49,6 @@ Debug x64 - - Release-Dynamic-Client - ARM - - - Release-Dynamic-Client - ARM64 - - - Release-Dynamic-Client - Win32 - - - Release-Dynamic-Client - x64 - Release-Dynamic ARM @@ -166,48 +134,24 @@ false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 @@ -262,48 +206,24 @@ false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 @@ -364,41 +284,21 @@ - - - - - - - - - - - - - - - - - - - - @@ -444,41 +344,21 @@ - - - - - - - - - - - - - - - - - - - - @@ -636,14 +516,6 @@ true - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;PJ_CLIENT;%(PreprocessorDefinitions) - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) @@ -652,14 +524,6 @@ - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - - X64 @@ -670,17 +534,6 @@ - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - - @@ -690,15 +543,6 @@ - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) @@ -707,14 +551,6 @@ true - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;PJ_CLIENT;%(PreprocessorDefinitions) - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) @@ -723,14 +559,6 @@ - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - - X64 @@ -742,18 +570,6 @@ ProgramDatabase - - - X64 - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - ProgramDatabase - - @@ -764,16 +580,6 @@ ProgramDatabase - - - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - _LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions) - - - ProgramDatabase - - ../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories) @@ -819,7 +625,6 @@ MaxSpeed - MaxSpeed MaxSpeed MaxSpeed @@ -877,69 +682,53 @@ true true true - true true true true - true true true true - true true true true - true true true true true true - true true - true true true true true true - true true - true true true true - true true true true - true true true true - true true true true - true true true true true true - true true - true true true true true true - true true - true @@ -1021,16 +810,6 @@ - - true - true - true - true - true - true - true - true - diff --git a/pjmedia/build/pjmedia.vcxproj.filters b/pjmedia/build/pjmedia.vcxproj.filters index a4267bf7b8..c750440f88 100644 --- a/pjmedia/build/pjmedia.vcxproj.filters +++ b/pjmedia/build/pjmedia.vcxproj.filters @@ -9,9 +9,6 @@ {299e6683-786a-497a-ab65-a7ae49842874} h;hpp;hxx;hm;inl - - {6e2190e6-cb61-431d-9b62-784b4e93c46e} - @@ -424,8 +421,5 @@ Header Files - - Header Files\vulkan - \ No newline at end of file diff --git a/pjsip-apps/build/libpjproject.vcxproj b/pjsip-apps/build/libpjproject.vcxproj index 21dc49d83e..eeb4083f14 100644 --- a/pjsip-apps/build/libpjproject.vcxproj +++ b/pjsip-apps/build/libpjproject.vcxproj @@ -1,22 +1,6 @@  - - Debug-Dynamic-Client - ARM - - - Debug-Dynamic-Client - ARM64 - - - Debug-Dynamic-Client - Win32 - - - Debug-Dynamic-Client - x64 - Debug-Dynamic ARM @@ -65,22 +49,6 @@ Debug x64 - - Release-Dynamic-Client - ARM - - - Release-Dynamic-Client - ARM64 - - - Release-Dynamic-Client - Win32 - - - Release-Dynamic-Client - x64 - Release-Dynamic ARM @@ -162,48 +130,24 @@ false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 @@ -258,48 +202,24 @@ false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 @@ -360,41 +280,21 @@ - - - - - - - - - - - - - - - - - - - - @@ -440,41 +340,21 @@ - - - - - - - - - - - - - - - - - - - - @@ -698,19 +578,6 @@ ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - _LIB;PJ_CLIENT;%(PreprocessorDefinitions) - - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - _LIB;%(PreprocessorDefinitions) @@ -725,20 +592,6 @@ /ignore:4264 - - - _LIB;%(PreprocessorDefinitions) - - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - /ignore:4264 - - X64 @@ -754,22 +607,6 @@ ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - X64 - - - _LIB;%(PreprocessorDefinitions) - - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - @@ -784,20 +621,6 @@ ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - _LIB;%(PreprocessorDefinitions) - - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - _LIB;%(PreprocessorDefinitions) @@ -810,19 +633,6 @@ ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - _LIB;PJ_CLIENT;%(PreprocessorDefinitions) - - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - _LIB;%(PreprocessorDefinitions) @@ -837,20 +647,6 @@ /ignore:4264 - - - _LIB;%(PreprocessorDefinitions) - - - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - /ignore:4264 - - X64 @@ -867,23 +663,6 @@ ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - X64 - - - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - @@ -899,21 +678,6 @@ ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - true - - - ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - _LIB;%(PreprocessorDefinitions) diff --git a/pjsip/build/pjsua_lib.vcxproj b/pjsip/build/pjsua_lib.vcxproj index 8f6641226c..220b26a63a 100644 --- a/pjsip/build/pjsua_lib.vcxproj +++ b/pjsip/build/pjsua_lib.vcxproj @@ -1,22 +1,6 @@  - - Debug-Dynamic-Client - ARM - - - Debug-Dynamic-Client - ARM64 - - - Debug-Dynamic-Client - Win32 - - - Debug-Dynamic-Client - x64 - Debug-Dynamic ARM @@ -65,22 +49,6 @@ Debug x64 - - Release-Dynamic-Client - ARM - - - Release-Dynamic-Client - ARM64 - - - Release-Dynamic-Client - Win32 - - - Release-Dynamic-Client - x64 - Release-Dynamic ARM @@ -161,48 +129,24 @@ false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 @@ -257,48 +201,24 @@ false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 false MultiByte - - StaticLibrary - v140 - false - MultiByte - StaticLibrary v140 @@ -359,41 +279,21 @@ - - - - - - - - - - - - - - - - - - - - @@ -439,41 +339,21 @@ - - - - - - - - - - - - - - - - - - - - @@ -667,17 +547,6 @@ ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;PJ_CLIENT;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) @@ -689,17 +558,6 @@ ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - X64 @@ -713,20 +571,6 @@ ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - X64 - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - @@ -739,18 +583,6 @@ ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) @@ -761,17 +593,6 @@ ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;PJ_CLIENT;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) @@ -783,17 +604,6 @@ ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - X64 @@ -808,21 +618,6 @@ ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - X64 - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - @@ -836,19 +631,6 @@ ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) - - - ProgramDatabase - - - ..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - ../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories) @@ -905,26 +687,6 @@ - - true - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - true - diff --git a/pjsip/build/pjsua_lib.vcxproj.filters b/pjsip/build/pjsua_lib.vcxproj.filters index 9850a7db96..d670c4ae46 100644 --- a/pjsip/build/pjsua_lib.vcxproj.filters +++ b/pjsip/build/pjsua_lib.vcxproj.filters @@ -9,9 +9,6 @@ {e83578b3-3953-431c-8cb0-3e0da189893c} h;hpp;hxx;hm;inl - - {c3260fa6-0427-42b4-bc21-6a450f043b27} - @@ -41,12 +38,6 @@ Source Files - - Source Files\vulkan - - - Source Files\vulkan - From 79f47fb0aba07b8c8b91d204fda1906daace58ad Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Sun, 27 Oct 2024 17:01:08 +0100 Subject: [PATCH 06/33] use traditional select ioqueue instead of iocp --- pjlib/build/pjlib.vcxproj | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pjlib/build/pjlib.vcxproj b/pjlib/build/pjlib.vcxproj index 541635a668..5cdc2ce733 100644 --- a/pjlib/build/pjlib.vcxproj +++ b/pjlib/build/pjlib.vcxproj @@ -755,14 +755,7 @@ true true - - true - true - true - true - true - true - + true true @@ -782,6 +775,12 @@ true true true + true + true + true + true + true + true true From 95f49c100d8f357fdf2169a047490c3ae1abde8f Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Sun, 27 Oct 2024 20:55:14 +0100 Subject: [PATCH 07/33] re-enabled lost stack test --- pjlib/src/pjlib-test/test.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/pjlib/src/pjlib-test/test.c b/pjlib/src/pjlib-test/test.c index 2be316a000..b8f753b73b 100644 --- a/pjlib/src/pjlib-test/test.c +++ b/pjlib/src/pjlib-test/test.c @@ -32,14 +32,14 @@ #endif -#define DO_TEST(test) do { \ - PJ_LOG(3, ("test", "Running %s...", #test)); \ - rc = test; \ - PJ_LOG(3, ("test", \ - "%s(%d)", \ - (rc ? "..ERROR" : "..success"), rc)); \ - if (rc!=0) goto on_return; \ - } while (0) +#define DO_TEST(test) do { \ + PJ_LOG(3, ("test", "Running %s...", #test)); \ + rc = test; \ + PJ_LOG(3, ("test", \ + "%s(%d)", \ + (rc ? "..ERROR" : "..success"), rc)); \ + if (rc!=0) goto on_return; \ + } while (0) pj_pool_factory *mem; @@ -48,7 +48,7 @@ int param_echo_sock_type; const char *param_echo_server = ECHO_SERVER_ADDRESS; int param_echo_port = ECHO_SERVER_START_PORT; int param_log_decor = PJ_LOG_HAS_NEWLINE | PJ_LOG_HAS_TIME | - PJ_LOG_HAS_MICRO_SEC | PJ_LOG_HAS_INDENT; + PJ_LOG_HAS_MICRO_SEC | PJ_LOG_HAS_INDENT; pj_bool_t param_ci_mode = PJ_FALSE; /* GH CI mode: more lenient tests */ int null_func() @@ -82,8 +82,8 @@ int test_inner(void) rc = pj_init(); if (rc != 0) { - app_perror("pj_init() error!!", rc); - return rc; + app_perror("pj_init() error!!", rc); + return rc; } pj_dump_config(); @@ -112,6 +112,10 @@ int test_inner(void) #if INCLUDE_LIST_TEST DO_TEST( list_test() ); #endif + +#if INCLUDE_STACK_TEST + DO_TEST(stack_test()); +#endif #if INCLUDE_POOL_TEST DO_TEST( pool_test() ); @@ -231,16 +235,16 @@ int test_inner(void) pj_caching_pool_destroy( &caching_pool ); - PJ_LOG(3,("test", " ")); + PJ_LOG(3,("test", "")); pj_thread_get_stack_info(pj_thread_this(), &filename, &line); PJ_LOG(3,("test", "Stack max usage: %u, deepest: %s:%u", - pj_thread_get_stack_max_usage(pj_thread_this()), - filename, line)); + pj_thread_get_stack_max_usage(pj_thread_this()), + filename, line)); if (rc == 0) - PJ_LOG(3,("test", "Looks like everything is okay!..")); + PJ_LOG(3,("test", "Looks like everything is okay!..")); else - PJ_LOG(3,("test", "Test completed with error(s)")); + PJ_LOG(3,("test", "Test completed with error(s)")); pj_shutdown(); From 24c959f54599cd7d13476bd2cb8d0c1b59594696 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Sun, 27 Oct 2024 23:43:09 +0100 Subject: [PATCH 08/33] untabify --- pjlib/include/pj/compat/cc_gcc.h | 48 +++++++++++++++---------------- pjlib/include/pj/compat/cc_msvc.h | 34 +++++++++++----------- pjlib/src/pjlib-test/test.c | 34 +++++++++++----------- pjlib/src/pjlib-test/test.h | 2 +- 4 files changed, 59 insertions(+), 59 deletions(-) diff --git a/pjlib/include/pj/compat/cc_gcc.h b/pjlib/include/pj/compat/cc_gcc.h index 5709aabbac..7f8ae66d37 100644 --- a/pjlib/include/pj/compat/cc_gcc.h +++ b/pjlib/include/pj/compat/cc_gcc.h @@ -28,49 +28,49 @@ # error "This file is only for gcc!" #endif -#define PJ_CC_NAME "gcc" -#define PJ_CC_VER_1 __GNUC__ -#define PJ_CC_VER_2 __GNUC_MINOR__ +#define PJ_CC_NAME "gcc" +#define PJ_CC_VER_1 __GNUC__ +#define PJ_CC_VER_2 __GNUC_MINOR__ /* __GNUC_PATCHLEVEL__ doesn't exist in gcc-2.9x.x */ #ifdef __GNUC_PATCHLEVEL__ -# define PJ_CC_VER_3 __GNUC_PATCHLEVEL__ +# define PJ_CC_VER_3 __GNUC_PATCHLEVEL__ #else -# define PJ_CC_VER_3 0 +# define PJ_CC_VER_3 0 #endif -#define PJ_THREAD_FUNC -#define PJ_NORETURN +#define PJ_THREAD_FUNC +#define PJ_NORETURN -#define PJ_HAS_INT64 1 +#define PJ_HAS_INT64 1 #ifdef __STRICT_ANSI__ #include - typedef int64_t pj_int64_t; - typedef uint64_t pj_uint64_t; - #define PJ_INLINE_SPECIFIER static __inline - #define PJ_ATTR_NORETURN - #define PJ_ATTR_MAY_ALIAS + typedef int64_t pj_int64_t; + typedef uint64_t pj_uint64_t; + #define PJ_INLINE_SPECIFIER static __inline + #define PJ_ATTR_NORETURN + #define PJ_ATTR_MAY_ALIAS #else - typedef long long pj_int64_t; - typedef unsigned long long pj_uint64_t; - #define PJ_INLINE_SPECIFIER static inline - #define PJ_ATTR_NORETURN __attribute__ ((noreturn)) - #define PJ_ATTR_MAY_ALIAS __attribute__((__may_alias__)) + typedef long long pj_int64_t; + typedef unsigned long long pj_uint64_t; + #define PJ_INLINE_SPECIFIER static inline + #define PJ_ATTR_NORETURN __attribute__ ((noreturn)) + #define PJ_ATTR_MAY_ALIAS __attribute__((__may_alias__)) #endif -#define PJ_INT64(val) val##LL -#define PJ_UINT64(val) val##ULL -#define PJ_INT64_FMT "L" +#define PJ_INT64(val) val##LL +#define PJ_UINT64(val) val##ULL +#define PJ_INT64_FMT "L" #ifdef __GLIBC__ -# define PJ_HAS_BZERO 1 +# define PJ_HAS_BZERO 1 #endif -#define PJ_UNREACHED(x) +#define PJ_UNREACHED(x) //#define PJ_ALIGN_DATA(declaration, alignment) declaration __attribute__((aligned (alignment))) #define PJ_ALIGN_DATA_PREFIX(alignment) @@ -80,5 +80,5 @@ #define PJ_SYS_ALIGN_PREFIX #define PJ_SYS_ALIGN_SUFFIX -#endif /* __PJ_COMPAT_CC_GCC_H__ */ +#endif /* __PJ_COMPAT_CC_GCC_H__ */ diff --git a/pjlib/include/pj/compat/cc_msvc.h b/pjlib/include/pj/compat/cc_msvc.h index a322f19c0a..03e14640cd 100644 --- a/pjlib/include/pj/compat/cc_msvc.h +++ b/pjlib/include/pj/compat/cc_msvc.h @@ -28,10 +28,10 @@ # error "This header file is only for Visual C compiler!" #endif -#define PJ_CC_NAME "msvc" -#define PJ_CC_VER_1 (_MSC_VER/100) -#define PJ_CC_VER_2 (_MSC_VER%100) -#define PJ_CC_VER_3 0 +#define PJ_CC_NAME "msvc" +#define PJ_CC_VER_1 (_MSC_VER/100) +#define PJ_CC_VER_2 (_MSC_VER%100) +#define PJ_CC_VER_3 0 /* Disable CRT deprecation warnings. */ #if PJ_CC_VER_1 >= 8 && !defined(_CRT_SECURE_NO_DEPRECATE) @@ -55,30 +55,30 @@ #endif #ifdef __cplusplus -# define PJ_INLINE_SPECIFIER inline +# define PJ_INLINE_SPECIFIER inline #else -# define PJ_INLINE_SPECIFIER static __inline +# define PJ_INLINE_SPECIFIER static __inline #endif #define PJ_EXPORT_DECL_SPECIFIER __declspec(dllexport) -#define PJ_EXPORT_DEF_SPECIFIER __declspec(dllexport) +#define PJ_EXPORT_DEF_SPECIFIER __declspec(dllexport) #define PJ_IMPORT_DECL_SPECIFIER __declspec(dllimport) -#define PJ_THREAD_FUNC -#define PJ_NORETURN __declspec(noreturn) -#define PJ_ATTR_NORETURN -#define PJ_ATTR_MAY_ALIAS +#define PJ_THREAD_FUNC +#define PJ_NORETURN __declspec(noreturn) +#define PJ_ATTR_NORETURN +#define PJ_ATTR_MAY_ALIAS -#define PJ_HAS_INT64 1 +#define PJ_HAS_INT64 1 typedef __int64 pj_int64_t; typedef unsigned __int64 pj_uint64_t; -#define PJ_INT64(val) val##i64 -#define PJ_UINT64(val) val##ui64 -#define PJ_INT64_FMT "I64" +#define PJ_INT64(val) val##i64 +#define PJ_UINT64(val) val##ui64 +#define PJ_INT64_FMT "I64" -#define PJ_UNREACHED(x) +#define PJ_UNREACHED(x) //#define PJ_ALIGN_DATA(declaration, alignment) __declspec(align(alignment)) declaration //#pragma warning(disable:4324) // structure padded due to align() @@ -92,5 +92,5 @@ typedef unsigned __int64 pj_uint64_t; #define PJ_SYS_ALIGN_SUFFIX PJ_ALIGN_DATA_SUFFIX(MEMORY_ALLOCATION_ALIGNMENT) -#endif /* __PJ_COMPAT_CC_MSVC_H__ */ +#endif /* __PJ_COMPAT_CC_MSVC_H__ */ diff --git a/pjlib/src/pjlib-test/test.c b/pjlib/src/pjlib-test/test.c index b8f753b73b..bc817bf9d8 100644 --- a/pjlib/src/pjlib-test/test.c +++ b/pjlib/src/pjlib-test/test.c @@ -32,14 +32,14 @@ #endif -#define DO_TEST(test) do { \ - PJ_LOG(3, ("test", "Running %s...", #test)); \ - rc = test; \ - PJ_LOG(3, ("test", \ - "%s(%d)", \ - (rc ? "..ERROR" : "..success"), rc)); \ - if (rc!=0) goto on_return; \ - } while (0) +#define DO_TEST(test) do { \ + PJ_LOG(3, ("test", "Running %s...", #test)); \ + rc = test; \ + PJ_LOG(3, ("test", \ + "%s(%d)", \ + (rc ? "..ERROR" : "..success"), rc)); \ + if (rc!=0) goto on_return; \ + } while (0) pj_pool_factory *mem; @@ -48,7 +48,7 @@ int param_echo_sock_type; const char *param_echo_server = ECHO_SERVER_ADDRESS; int param_echo_port = ECHO_SERVER_START_PORT; int param_log_decor = PJ_LOG_HAS_NEWLINE | PJ_LOG_HAS_TIME | - PJ_LOG_HAS_MICRO_SEC | PJ_LOG_HAS_INDENT; + PJ_LOG_HAS_MICRO_SEC | PJ_LOG_HAS_INDENT; pj_bool_t param_ci_mode = PJ_FALSE; /* GH CI mode: more lenient tests */ int null_func() @@ -82,8 +82,8 @@ int test_inner(void) rc = pj_init(); if (rc != 0) { - app_perror("pj_init() error!!", rc); - return rc; + app_perror("pj_init() error!!", rc); + return rc; } pj_dump_config(); @@ -112,7 +112,7 @@ int test_inner(void) #if INCLUDE_LIST_TEST DO_TEST( list_test() ); #endif - + #if INCLUDE_STACK_TEST DO_TEST(stack_test()); #endif @@ -235,16 +235,16 @@ int test_inner(void) pj_caching_pool_destroy( &caching_pool ); - PJ_LOG(3,("test", "")); + PJ_LOG(3,("test", " ")); pj_thread_get_stack_info(pj_thread_this(), &filename, &line); PJ_LOG(3,("test", "Stack max usage: %u, deepest: %s:%u", - pj_thread_get_stack_max_usage(pj_thread_this()), - filename, line)); + pj_thread_get_stack_max_usage(pj_thread_this()), + filename, line)); if (rc == 0) - PJ_LOG(3,("test", "Looks like everything is okay!..")); + PJ_LOG(3,("test", "Looks like everything is okay!..")); else - PJ_LOG(3,("test", "Test completed with error(s)")); + PJ_LOG(3,("test", "Test completed with error(s)")); pj_shutdown(); diff --git a/pjlib/src/pjlib-test/test.h b/pjlib/src/pjlib-test/test.h index 50fd648bdf..66bba8da08 100644 --- a/pjlib/src/pjlib-test/test.h +++ b/pjlib/src/pjlib-test/test.h @@ -44,7 +44,7 @@ #define INCLUDE_EXCEPTION_TEST GROUP_LIBC #define INCLUDE_RAND_TEST GROUP_LIBC #define INCLUDE_LIST_TEST GROUP_DATA_STRUCTURE -#define INCLUDE_STACK_TEST GROUP_DATA_STRUCTURE +#define INCLUDE_STACK_TEST GROUP_DATA_STRUCTURE #define INCLUDE_HASH_TEST GROUP_DATA_STRUCTURE #define INCLUDE_POOL_TEST GROUP_LIBC #define INCLUDE_POOL_PERF_TEST (GROUP_LIBC && WITH_BENCHMARK) From 48f47a257b749b2dcdf584a8fc0b3bc3735ec377 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Mon, 28 Oct 2024 01:04:11 +0100 Subject: [PATCH 09/33] makefiles fixes --- pjlib/build/Makefile | 2 +- pjlib/build/os-linux.mak | 3 ++- pjlib/build/os-win32.mak | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pjlib/build/Makefile b/pjlib/build/Makefile index d13951b042..7ee64df2f8 100644 --- a/pjlib/build/Makefile +++ b/pjlib/build/Makefile @@ -50,7 +50,7 @@ export TEST_OBJS += activesock.o atomic.o echo_clt.o errno.o exception.o \ ioq_stress_test.o ioq_unreg.o ioq_tcp.o \ list.o mutex.o os.o pool.o pool_perf.o rand.o rbtree.o \ select.o sleep.o sock.o sock_perf.o ssl_sock.o \ - string.o test.o thread.o timer.o timestamp.o \ + stack.o string.o test.o thread.o timer.o timestamp.o \ udp_echo_srv_sync.o udp_echo_srv_ioqueue.o \ unittest_test.o util.o export TEST_CFLAGS += $(_CFLAGS) diff --git a/pjlib/build/os-linux.mak b/pjlib/build/os-linux.mak index 048b1ab1ab..3c06054843 100644 --- a/pjlib/build/os-linux.mak +++ b/pjlib/build/os-linux.mak @@ -12,7 +12,8 @@ export PJLIB_OBJS += addr_resolv_sock.o file_access_unistd.o \ log_writer_stdout.o os_core_unix.o \ os_error_unix.o os_time_unix.o \ os_timestamp_common.o os_timestamp_posix.o \ - pool_policy_malloc.o sock_bsd.o sock_select.o + pool_policy_malloc.o sock_bsd.o sock_select.o \ + stack.o ifeq (epoll,$(LINUX_POLL)) export PJLIB_OBJS += ioqueue_epoll.o diff --git a/pjlib/build/os-win32.mak b/pjlib/build/os-win32.mak index 9eb1191f8f..2feb0834ba 100644 --- a/pjlib/build/os-win32.mak +++ b/pjlib/build/os-win32.mak @@ -11,7 +11,8 @@ export PJLIB_OBJS += addr_resolv_sock.o guid_win32.o unicode_win32.o \ log_writer_stdout.o os_core_win32.o \ os_error_win32.o os_time_bsd.o os_timestamp_common.o \ os_timestamp_win32.o \ - pool_policy_malloc.o sock_bsd.o sock_select.o + pool_policy_malloc.o sock_bsd.o sock_select.o \ + stack_win32.o #export PJLIB_OBJS += ioqueue_winnt.o export PJLIB_OBJS += ioqueue_select.o From dd3bdc32155a2ff9965969048cb8605b8693f437 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Mon, 28 Oct 2024 17:05:27 +0100 Subject: [PATCH 10/33] VS projects and solution files changes - some changes in sln to build with v143 build tools (VS 2022) - 2 new pjsystest project configuration to build as Debug-Dynamic and Release-Dynamic - stack implementation and testing incorporated into pjlib and pjlib-test projects --- build/vs/pjproject-vs14-common-config.props | 8 +- pjlib/build/pjlib.vcxproj | 28 + pjlib/build/pjlib.vcxproj.filters | 908 ++++++----- pjlib/build/pjlib_test.vcxproj | 1625 ++++++++++--------- pjlib/build/pjlib_test.vcxproj.filters | 271 ++-- pjproject-vs14.sln | 20 +- pjsip-apps/build/pjsystest.vcxproj | 559 ++++--- 7 files changed, 1807 insertions(+), 1612 deletions(-) diff --git a/build/vs/pjproject-vs14-common-config.props b/build/vs/pjproject-vs14-common-config.props index 456e4f02e1..d2e455b4c9 100644 --- a/build/vs/pjproject-vs14-common-config.props +++ b/build/vs/pjproject-vs14-common-config.props @@ -18,20 +18,20 @@ WinDesktop - v140 + v143 - v140 + v143 WIN32;PJ_WIN32=1;PJ_M_I386=1; WIN64;PJ_WIN64=1;PJ_M_X86_64=1; - PJ_M_ARM64=1; + PJ_M_ARM64=1; - v140 + v143 PJ_WIN32_UWP;UNICODE;_UNICODE; $(PreprocessorDef);PJ_M_ARMV7=1; 10.0.10586.0 diff --git a/pjlib/build/pjlib.vcxproj b/pjlib/build/pjlib.vcxproj index 4467f52e20..04c4ec4add 100644 --- a/pjlib/build/pjlib.vcxproj +++ b/pjlib/build/pjlib.vcxproj @@ -999,6 +999,33 @@ + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + true @@ -1097,6 +1124,7 @@ + diff --git a/pjlib/build/pjlib.vcxproj.filters b/pjlib/build/pjlib.vcxproj.filters index 2889b4666e..23cd27de38 100644 --- a/pjlib/build/pjlib.vcxproj.filters +++ b/pjlib/build/pjlib.vcxproj.filters @@ -1,449 +1,461 @@ - - - - - {c8a8e8d9-1fbe-477c-91c9-5f4c495a2ad1} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {366d56a2-30a3-409b-9bd6-14ddc94069e0} - - - {77df8652-bc15-4733-a454-bbf8f16f93f1} - h;hpp;hxx;hm;inl - - - {3e7b3f2e-8699-43c9-801e-2c54e3f07023} - - - {4befc994-9aa4-47c8-99e7-5a51301220dd} - - - {4a92fce6-2308-44cf-aa66-00ccd5b333bd} - - - {3550aa38-c59d-4d5f-b458-1f93e0b16bbd} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\winrt - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Inline Files - - - Inline Files - - - Inline Files - - - Header Files\compat - - - Header Files\winrt - - - Header Files\compat - - - Header Files - - - Header Files\compat - - - Header Files - - - Header Files - - + + + + + {c8a8e8d9-1fbe-477c-91c9-5f4c495a2ad1} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {366d56a2-30a3-409b-9bd6-14ddc94069e0} + + + {77df8652-bc15-4733-a454-bbf8f16f93f1} + h;hpp;hxx;hm;inl + + + {3e7b3f2e-8699-43c9-801e-2c54e3f07023} + + + {4befc994-9aa4-47c8-99e7-5a51301220dd} + + + {4a92fce6-2308-44cf-aa66-00ccd5b333bd} + + + {3550aa38-c59d-4d5f-b458-1f93e0b16bbd} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\winrt + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Inline Files + + + Inline Files + + + Inline Files + + + Header Files\compat + + + Header Files\winrt + + + Header Files\compat + + + Header Files + + + Header Files\compat + + + Header Files + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/pjlib/build/pjlib_test.vcxproj b/pjlib/build/pjlib_test.vcxproj index 0801881867..cb262166b5 100644 --- a/pjlib/build/pjlib_test.vcxproj +++ b/pjlib/build/pjlib_test.vcxproj @@ -1,813 +1,814 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16} - pjlib_test - - en-US - - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - - $(BuildToolset) - - - Application - StaticLibrary - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - - - MultiThreadedDebugDLL - - - ..\lib\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - {23d7679c-764c-4e02-8b29-bb882ceeefe2} - false - - - - - + + + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16} + pjlib_test + + en-US + + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + + $(BuildToolset) + + + Application + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + + + MultiThreadedDebugDLL + + + ..\lib\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {23d7679c-764c-4e02-8b29-bb882ceeefe2} + false + + + + + \ No newline at end of file diff --git a/pjlib/build/pjlib_test.vcxproj.filters b/pjlib/build/pjlib_test.vcxproj.filters index 64451af637..9ac0c8bc64 100644 --- a/pjlib/build/pjlib_test.vcxproj.filters +++ b/pjlib/build/pjlib_test.vcxproj.filters @@ -1,135 +1,138 @@ - - - - - {87ba28ea-fd15-43b2-8da2-52ca1fedaa86} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {d65a57ff-143e-46bc-92e3-bef39475b72a} - h;hpp;hxx;hm;inl - - - {131d925a-9a14-4c13-87f9-4350e5b57a65} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - + + + + + {87ba28ea-fd15-43b2-8da2-52ca1fedaa86} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {d65a57ff-143e-46bc-92e3-bef39475b72a} + h;hpp;hxx;hm;inl + + + {131d925a-9a14-4c13-87f9-4350e5b57a65} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + \ No newline at end of file diff --git a/pjproject-vs14.sln b/pjproject-vs14.sln index fcd0926d70..7ec360db4c 100644 --- a/pjproject-vs14.sln +++ b/pjproject-vs14.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31624.102 +# Visual Studio Version 17 +VisualStudioVersion = 17.11.35327.3 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1DFF1CF3-DBD7-4DA4-A36D-663D695EB678}" ProjectSection(SolutionItems) = preProject @@ -121,10 +121,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimplePjsua2CS", "pjsip-apps\src\swig\csharp\sample\SimplePjsua2CS\SimplePjsua2CS.csproj", "{3DCDD02D-C3CF-40EB-A66C-F7C2DAD93FD9}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - pjsip-apps\src\pjsua\winrt\cli\comp\pjsua_cli_shared_comp.vcxitems*{207e7bd4-7b11-4a40-ba3a-cc627762a7b6}*SharedItemsImports = 4 - pjsip-apps\src\pjsua\winrt\cli\comp\pjsua_cli_shared_comp.vcxitems*{45d41acc-2c3c-43d2-bc10-02aa73ffc7c7}*SharedItemsImports = 9 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM @@ -1571,8 +1567,8 @@ Global {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|ARM.ActiveCfg = Debug|Win32 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|ARM64.ActiveCfg = Debug|ARM64 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|ARM64.Build.0 = Debug|ARM64 - {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|Win32.ActiveCfg = Debug|Win32 - {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|Win32.Build.0 = Debug|Win32 + {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32 + {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|x64.ActiveCfg = Debug|x64 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|x64.Build.0 = Debug|x64 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Static|Any CPU.ActiveCfg = Release|x64 @@ -1597,8 +1593,8 @@ Global {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|ARM.ActiveCfg = Release|Win32 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|ARM64.ActiveCfg = Release|ARM64 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|ARM64.Build.0 = Release|ARM64 - {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|Win32.ActiveCfg = Release|Win32 - {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|Win32.Build.0 = Release|Win32 + {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32 + {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|x64.ActiveCfg = Release|x64 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|x64.Build.0 = Release|x64 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Static|Any CPU.ActiveCfg = Release|x64 @@ -2525,4 +2521,8 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9D1363FE-B481-479E-82A2-290F6C4DB91B} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + pjsip-apps\src\pjsua\winrt\cli\comp\pjsua_cli_shared_comp.vcxitems*{207e7bd4-7b11-4a40-ba3a-cc627762a7b6}*SharedItemsImports = 4 + pjsip-apps\src\pjsua\winrt\cli\comp\pjsua_cli_shared_comp.vcxitems*{45d41acc-2c3c-43d2-bc10-02aa73ffc7c7}*SharedItemsImports = 9 + EndGlobalSection EndGlobal diff --git a/pjsip-apps/build/pjsystest.vcxproj b/pjsip-apps/build/pjsystest.vcxproj index 568b2ff816..98786e29ef 100644 --- a/pjsip-apps/build/pjsystest.vcxproj +++ b/pjsip-apps/build/pjsystest.vcxproj @@ -1,205 +1,356 @@ - - - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB} - pjsystest - Win32Proj - - en-US - - - - Application - v140 - - - Application - v140 - - - Application - v140 - - - Application - v140 - - - Application - v140 - - - Application - v140 - - - - $(BuildToolset) - - - Application - StaticLibrary - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - - - - - MultiThreadedDebugDLL - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - X64 - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - MachineX64 - - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - X64 - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - MachineX64 - - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - - true - true - true - true - true - true - - - - - - - - - - {23d7679c-764c-4e02-8b29-bb882ceeefe2} - false - - - - - + + + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB} + pjsystest + Win32Proj + + en-US + + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + + $(BuildToolset) + + + Application + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + + + + + MultiThreadedDebugDLL + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + X64 + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + MachineX64 + + + + + X64 + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + MachineX64 + + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + X64 + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + MachineX64 + + + + + X64 + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + MachineX64 + + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + + true + true + true + true + true + true + true + true + true + true + true + true + + + + + + + + + + {23d7679c-764c-4e02-8b29-bb882ceeefe2} + false + + + + + \ No newline at end of file From 52e008695b9ab3e2062db6776294bdb7eb736af3 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Tue, 29 Oct 2024 01:33:04 +0100 Subject: [PATCH 11/33] define appropriate PJ_POOL_ALIGNMENT for Windows platform --- pjlib/include/pj/compat/cc_msvc.h | 10 ++++++---- pjlib/include/pj/compat/os_win32.h | 15 +++++++++++++++ pjlib/include/pj/compat/os_winuwp.h | 13 +++++++++++++ pjlib/src/pjlib-test/stack.c | 20 ++++++++++---------- 4 files changed, 44 insertions(+), 14 deletions(-) diff --git a/pjlib/include/pj/compat/cc_msvc.h b/pjlib/include/pj/compat/cc_msvc.h index 03e14640cd..2cce17982f 100644 --- a/pjlib/include/pj/compat/cc_msvc.h +++ b/pjlib/include/pj/compat/cc_msvc.h @@ -87,10 +87,12 @@ typedef unsigned __int64 pj_uint64_t; #define PJ_ALIGN_DATA_SUFFIX(alignment) __pragma(warning(pop)) #define PJ_ALIGN_DATA(declaration, alignment) PJ_ALIGN_DATA_PREFIX(alignment) declaration PJ_ALIGN_DATA_SUFFIX(alignment) -//please add #include into your config_site.h if macro bellow is not compilable -#define PJ_SYS_ALIGN_PREFIX PJ_ALIGN_DATA_PREFIX(MEMORY_ALLOCATION_ALIGNMENT) -#define PJ_SYS_ALIGN_SUFFIX PJ_ALIGN_DATA_SUFFIX(MEMORY_ALLOCATION_ALIGNMENT) - +////please add #include into your config_site.h if macro bellow is not compilable +//#define PJ_SYS_ALIGN_PREFIX PJ_ALIGN_DATA_PREFIX(MEMORY_ALLOCATION_ALIGNMENT) +//#define PJ_SYS_ALIGN_SUFFIX PJ_ALIGN_DATA_SUFFIX(MEMORY_ALLOCATION_ALIGNMENT) +/* PJ_POOL_ALIGNMENT is defined in os_win32.h and os_winuwp.h */ +#define PJ_SYS_ALIGN_PREFIX PJ_ALIGN_DATA_PREFIX(PJ_POOL_ALIGNMENT) +#define PJ_SYS_ALIGN_SUFFIX PJ_ALIGN_DATA_SUFFIX(PJ_POOL_ALIGNMENT) #endif /* __PJ_COMPAT_CC_MSVC_H__ */ diff --git a/pjlib/include/pj/compat/os_win32.h b/pjlib/include/pj/compat/os_win32.h index a9b3512c99..82ad1ae333 100644 --- a/pjlib/include/pj/compat/os_win32.h +++ b/pjlib/include/pj/compat/os_win32.h @@ -149,5 +149,20 @@ #endif +/* The pj_stack implementation requires and checks that + * PJ_POOL_ALIGNMENT is not less than MEMORY_ALLOCATION_ALIGNMENT + * which is 16 for x64 and 8 for x86 platform + * see winnt.h + */ +#if defined(MEMORY_ALLOCATION_ALIGNMENT) +# define PJ_POOL_ALIGNMENT MEMORY_ALLOCATION_ALIGNMENT +#elif defined(_WIN64) || defined(_M_ALPHA) + //#elif defined(_WIN64) || defined(WIN64) +# define PJ_POOL_ALIGNMENT 16 +#else +# define PJ_POOL_ALIGNMENT 8 +#endif + + #endif /* __PJ_COMPAT_OS_WIN32_H__ */ diff --git a/pjlib/include/pj/compat/os_winuwp.h b/pjlib/include/pj/compat/os_winuwp.h index 60b8e2a343..82a0342a93 100644 --- a/pjlib/include/pj/compat/os_winuwp.h +++ b/pjlib/include/pj/compat/os_winuwp.h @@ -145,5 +145,18 @@ */ #define PJ_THREAD_ALLOCATE_STACK 0 +/* The pj_stack implementation requires and checks that + * PJ_POOL_ALIGNMENT is not less than MEMORY_ALLOCATION_ALIGNMENT + * which is 16 for x64 and 8 for x86 platform + * see winnt.h + */ +#if defined(MEMORY_ALLOCATION_ALIGNMENT) +# define PJ_POOL_ALIGNMENT MEMORY_ALLOCATION_ALIGNMENT +#elif defined(_WIN64) || defined(_M_ALPHA) + //#elif defined(_WIN64) || defined(WIN64) +# define PJ_POOL_ALIGNMENT 16 +#else +# define PJ_POOL_ALIGNMENT 8 +#endif #endif /* __PJ_COMPAT_OS_UWP_H__ */ diff --git a/pjlib/src/pjlib-test/stack.c b/pjlib/src/pjlib-test/stack.c index 2f6008ac87..ab56532271 100644 --- a/pjlib/src/pjlib-test/stack.c +++ b/pjlib/src/pjlib-test/stack.c @@ -26,9 +26,9 @@ #ifdef PJ_WIN32 -#if !defined(MEMORY_ALLOCATION_ALIGNMENT) -#include -#endif //MEMORY_ALLOCATION_ALIGNMENT +# if !defined(MEMORY_ALLOCATION_ALIGNMENT) +# include +# endif //MEMORY_ALLOCATION_ALIGNMENT #endif // PJ_WIN32 @@ -65,10 +65,10 @@ int stack_test() #ifdef PJ_WIN32 -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4324) // structure padded due to align() -#endif // defined(_MSC_VER) +# if defined(_MSC_VER) +# pragma warning(push) +# pragma warning(disable:4324) // structure padded due to align() +# endif // defined(_MSC_VER) if (TYPE_ALIGNMENT(stack_node) < MEMORY_ALLOCATION_ALIGNMENT) { @@ -77,9 +77,9 @@ int stack_test() goto error; } -#if defined(_MSC_VER) -#pragma warning(pop) -#endif // defined(_MSC_VER) +# if defined(_MSC_VER) +# pragma warning(pop) +# endif // defined(_MSC_VER) for (i = 0; i < sz; ++i) { if (!IS_ALIGNED_PTR(&nodes[i], MEMORY_ALLOCATION_ALIGNMENT)) From 6a331a1998ff4bf8809e52e978b9cf84d0259160 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Tue, 29 Oct 2024 19:05:46 +0100 Subject: [PATCH 12/33] make files fix --- pjlib/build/os-darwinos.mak | 2 ++ pjlib/build/os-linux.mak | 5 +++-- pjlib/build/os-rtems.mak | 2 ++ pjlib/build/os-sunos.mak | 2 ++ pjlib/include/pj/config.h | 8 ++++++++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pjlib/build/os-darwinos.mak b/pjlib/build/os-darwinos.mak index 931a9bdc9a..3a55f18e3e 100644 --- a/pjlib/build/os-darwinos.mak +++ b/pjlib/build/os-darwinos.mak @@ -13,6 +13,8 @@ export PJLIB_OBJS += addr_resolv_sock.o guid_simple.o \ os_timestamp_common.o os_timestamp_posix.o \ pool_policy_malloc.o sock_bsd.o sock_select.o +export PJLIB_OBJS += stack.o + export PJLIB_OBJS += ioqueue_select.o #export PJLIB_OBJS += ioqueue_epoll.o diff --git a/pjlib/build/os-linux.mak b/pjlib/build/os-linux.mak index 3c06054843..34b437b651 100644 --- a/pjlib/build/os-linux.mak +++ b/pjlib/build/os-linux.mak @@ -12,8 +12,9 @@ export PJLIB_OBJS += addr_resolv_sock.o file_access_unistd.o \ log_writer_stdout.o os_core_unix.o \ os_error_unix.o os_time_unix.o \ os_timestamp_common.o os_timestamp_posix.o \ - pool_policy_malloc.o sock_bsd.o sock_select.o \ - stack.o + pool_policy_malloc.o sock_bsd.o sock_select.o + +export PJLIB_OBJS += stack.o ifeq (epoll,$(LINUX_POLL)) export PJLIB_OBJS += ioqueue_epoll.o diff --git a/pjlib/build/os-rtems.mak b/pjlib/build/os-rtems.mak index ebc509f42f..0695a12d31 100644 --- a/pjlib/build/os-rtems.mak +++ b/pjlib/build/os-rtems.mak @@ -16,6 +16,8 @@ export PJLIB_OBJS += addr_resolv_sock.o guid_simple.o \ os_timestamp_common.o os_timestamp_posix.o \ pool_policy_malloc.o sock_bsd.o sock_select.o +export PJLIB_OBJS += stack.o + export PJLIB_OBJS += ioqueue_select.o export PJLIB_OBJS += file_access_unistd.o file_io_ansi.o export PJLIB_OBJS += sock_qos_bsd.o diff --git a/pjlib/build/os-sunos.mak b/pjlib/build/os-sunos.mak index f3bffaa973..f2b0d3deb9 100644 --- a/pjlib/build/os-sunos.mak +++ b/pjlib/build/os-sunos.mak @@ -14,6 +14,8 @@ export PJLIB_OBJS += addr_resolv_sock.o file_access_unistd.o \ os_timestamp_common.o os_timestamp_posix.o \ pool_policy_malloc.o sock_bsd.o sock_select.o +export PJLIB_OBJS += stack.o + export PJLIB_OBJS += ioqueue_select.o #export PJLIB_OBJS += ioqueue_epoll.o diff --git a/pjlib/include/pj/config.h b/pjlib/include/pj/config.h index 6736d47344..048bdf926b 100644 --- a/pjlib/include/pj/config.h +++ b/pjlib/include/pj/config.h @@ -51,6 +51,14 @@ # error "PJ_ALIGN_DATA is not defined!" #endif +#ifndef PJ_SYS_ALIGN_PREFIX +# define PJ_SYS_ALIGN_PREFIX +#endif + +#ifndef PJ_SYS_ALIGN_SUFFIX +# define PJ_SYS_ALIGN_SUFFIX +#endif + /******************************************************************** * Include target OS specific configuration. */ From 5fec115c8d15ebb82dce0ba18698bf7fd2613607 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Tue, 29 Oct 2024 19:56:13 +0100 Subject: [PATCH 13/33] stack implementation files added to aconfugure.* --- aconfigure | 4 ++-- aconfigure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aconfigure b/aconfigure index 47fce480ee..088d786b04 100755 --- a/aconfigure +++ b/aconfigure @@ -6613,10 +6613,10 @@ fi case $target in *mingw* | *cygw* | *win32* | *w32* ) - ac_os_objs="$ac_os_objs file_access_win32.o file_io_win32.o os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o sock_qos_bsd.o unicode_win32.o" + ac_os_objs="$ac_os_objs file_access_win32.o file_io_win32.o os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o sock_qos_bsd.o unicode_win32.o stack_win32.o" ;; *) - ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o" + ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o stack.o" case $target in *-apple-darwin_ios*) ac_os_objs="$ac_os_objs os_info_iphone.o os_core_darwin.o" diff --git a/aconfigure.ac b/aconfigure.ac index df91fbe0e2..1ca2797f73 100644 --- a/aconfigure.ac +++ b/aconfigure.ac @@ -536,10 +536,10 @@ dnl # OS specific files dnl # case $target in *mingw* | *cygw* | *win32* | *w32* ) - ac_os_objs="$ac_os_objs file_access_win32.o file_io_win32.o os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o sock_qos_bsd.o unicode_win32.o" + ac_os_objs="$ac_os_objs file_access_win32.o file_io_win32.o os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o sock_qos_bsd.o unicode_win32.o stack_win32.o" ;; *) - ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o" + ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o stack.o" case $target in *-apple-darwin_ios*) ac_os_objs="$ac_os_objs os_info_iphone.o os_core_darwin.o" From 547b72d02b02033b79d8200a8fd151fde97f2c04 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Sun, 24 Nov 2024 20:25:21 +0100 Subject: [PATCH 14/33] merge conflicts resolved --- aconfigure | 3374 ++++++++++++++------------- aconfigure.ac | 4173 ++++++++++++++++++---------------- pjlib/src/pj/os_core_win32.c | 13 +- 3 files changed, 4059 insertions(+), 3501 deletions(-) diff --git a/aconfigure b/aconfigure index 088d786b04..d5d587bfcd 100755 --- a/aconfigure +++ b/aconfigure @@ -690,7 +690,6 @@ ac_openh264_ldflags ac_openh264_cflags ac_v4l2_ldflags ac_v4l2_cflags -PKG_CONFIG SAVED_PKG_CONFIG_PATH ac_ffmpeg_ldflags ac_ffmpeg_cflags @@ -744,6 +743,7 @@ ac_linux_poll ac_os_objs ac_std_cpp_lib ac_target_arch +PKG_CONFIG ac_cross_compile ac_shlib_suffix ac_cflags @@ -1567,16 +1567,12 @@ Optional Features: Exclude Android MediaCodec (default: autodetect) --disable-darwin-ssl Exclude Darwin SSL (default: autodetect) --disable-ssl Exclude SSL support the build (default: autodetect) - --disable-opencore-amr Exclude OpenCORE AMR support from the build (default: autodetect) - --disable-silk Exclude SILK support from the build (default: autodetect) - --disable-opus Exclude OPUS support from the build (default: autodetect) - --disable-bcg729 Disable bcg729 (default: not disabled) --disable-lyra Disable lyra (default: not disabled) --disable-libsrtp Exclude libsrtp in the build @@ -3222,12 +3218,12 @@ 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" +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" if test "$CFLAGS" = ""; then - CFLAGS="-O2" + CFLAGS="-O2" fi @@ -4505,11 +4501,11 @@ if test x$ac_prog_cxx_stdcxx = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 printf %s "checking for $CXX option to enable C++11 features... " >&6; } -if test ${ac_cv_prog_cxx_11+y} +if test ${ac_cv_prog_cxx_cxx11+y} then : printf %s "(cached) " >&6 else $as_nop - ac_cv_prog_cxx_11=no + ac_cv_prog_cxx_cxx11=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4551,11 +4547,11 @@ if test x$ac_prog_cxx_stdcxx = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 printf %s "checking for $CXX option to enable C++98 features... " >&6; } -if test ${ac_cv_prog_cxx_98+y} +if test ${ac_cv_prog_cxx_cxx98+y} then : printf %s "(cached) " >&6 else $as_nop - ac_cv_prog_cxx_98=no + ac_cv_prog_cxx_cxx98=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4882,29 +4878,29 @@ if test "$CC_CFLAGS" = ""; then CC_CFLAGS="-Wall"; fi case $host in *mingw* | *cygw* | *win32* | *w32* ) - if pwd -W 2&> /dev/null; then - ac_pjdir=`pwd -W` - else - # We're probably cross-compiling mingw on Linux - ac_pjdir=`pwd` - fi - ;; + if pwd -W 2&> /dev/null; then + ac_pjdir=`pwd -W` + else + # We're probably cross-compiling mingw on Linux + ac_pjdir=`pwd` + fi + ;; *) - ac_pjdir=`pwd` - ;; + ac_pjdir=`pwd` + ;; esac case $target in *mingw* | *cygw* | *win32* | *w32* ) - ac_shlib_suffix=dll - ;; + ac_shlib_suffix=dll + ;; *darwin*) - ac_shlib_suffix=dylib - ;; + ac_shlib_suffix=dylib + ;; *) - ac_shlib_suffix=so - ;; + ac_shlib_suffix=so + ;; esac @@ -5259,18 +5255,68 @@ then : fi +for ac_prog in $host_cpu-$host_os-pkg-config $host-pkg-config pkg-config "python pkgconfig.py" +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$PKG_CONFIG"; then + ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_PKG_CONFIG="$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +PKG_CONFIG=$ac_cv_prog_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$PKG_CONFIG" && break +done +test -n "$PKG_CONFIG" || PKG_CONFIG="none" + # Check whether --enable-libuuid was given. if test ${enable_libuuid+y} then : - enableval=$enable_libuuid; if test "$enable_libuuid" = "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libuuid disabled... yes" >&5 + enableval=$enable_libuuid; + if test "$enable_libuuid" = "no"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libuuid disabled... yes" >&5 printf "%s\n" "Checking if libuuid disabled... yes" >&6; } - ac_has_uuid_lib=0 - fi + ac_has_uuid_lib=0 + fi + else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5 printf %s "checking for uuid_generate in -luuid... " >&6; } if test ${ac_cv_lib_uuid_uuid_generate+y} then : @@ -5313,7 +5359,7 @@ then : fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5 printf %s "checking for uuid_generate in -luuid... " >&6; } if test ${ac_cv_lib_uuid_uuid_generate+y} then : @@ -5354,6 +5400,7 @@ then : fi + fi @@ -5426,17 +5473,17 @@ printf "%s\n" "#define PJ_M_NAME \"$target_cpu\"" >>confdefs.h printf %s "checking memory alignment... " >&6; } case $target in sparc64-* | ia64-* | x86_64-* | arm64-* | aarch64-* | mips64* ) - printf "%s\n" "#define PJ_POOL_ALIGNMENT 8" >>confdefs.h + printf "%s\n" "#define PJ_POOL_ALIGNMENT 8" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: 8 bytes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: 8 bytes" >&5 printf "%s\n" "8 bytes" >&6; } - ;; + ;; * ) - printf "%s\n" "#define PJ_POOL_ALIGNMENT 4" >>confdefs.h + printf "%s\n" "#define PJ_POOL_ALIGNMENT 4" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: 4 bytes (default)" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: 4 bytes (default)" >&5 printf "%s\n" "4 bytes (default)" >&6; } - ;; + ;; esac @@ -5704,77 +5751,80 @@ printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h if test "x$ac_cv_c_bigendian" = "xyes"; then - CFLAGS="$CFLAGS -DPJ_IS_BIG_ENDIAN=1 -DPJ_IS_LITTLE_ENDIAN=0" - ac_cflags="$ac_cflags -DPJ_IS_BIG_ENDIAN=1 -DPJ_IS_LITTLE_ENDIAN=0" + CFLAGS="$CFLAGS -DPJ_IS_BIG_ENDIAN=1 -DPJ_IS_LITTLE_ENDIAN=0" + ac_cflags="$ac_cflags -DPJ_IS_BIG_ENDIAN=1 -DPJ_IS_LITTLE_ENDIAN=0" else - CFLAGS="$CFLAGS -DPJ_IS_BIG_ENDIAN=0 -DPJ_IS_LITTLE_ENDIAN=1" - ac_cflags="$ac_cflags -DPJ_IS_BIG_ENDIAN=0 -DPJ_IS_LITTLE_ENDIAN=1" + CFLAGS="$CFLAGS -DPJ_IS_BIG_ENDIAN=0 -DPJ_IS_LITTLE_ENDIAN=1" + ac_cflags="$ac_cflags -DPJ_IS_BIG_ENDIAN=0 -DPJ_IS_LITTLE_ENDIAN=1" fi case $target in *android*) - printf "%s\n" "#define PJ_ANDROID 1" >>confdefs.h + printf "%s\n" "#define PJ_ANDROID 1" >>confdefs.h - ac_target_arch=$TARGET_ABI - ac_std_cpp_lib=$STD_CPP_LIB - ;; + ac_target_arch=$TARGET_ABI + ac_std_cpp_lib=$STD_CPP_LIB + ;; *mingw* | *cygw* | *win32* | *w32* ) - printf "%s\n" "#define PJ_WIN32 1" >>confdefs.h + printf "%s\n" "#define PJ_WIN32 1" >>confdefs.h - printf "%s\n" "#define PJ_WIN32_WINNT 0x0400" >>confdefs.h + printf "%s\n" "#define PJ_WIN32_WINNT 0x0501" >>confdefs.h - printf "%s\n" "#define WIN32_LEAN_AND_MEAN 1" >>confdefs.h + printf "%s\n" "#define WIN32_LEAN_AND_MEAN 1" >>confdefs.h - case $target in - *_64-w64-mingw* ) - printf "%s\n" "#define PJ_WIN64 1" >>confdefs.h + case $target in + *_64-w64-mingw* ) + printf "%s\n" "#define PJ_WIN64 1" >>confdefs.h - ;; - esac - ;; + ;; + esac + ;; *darwin*) - printf "%s\n" "#define PJ_DARWINOS 1" >>confdefs.h + printf "%s\n" "#define PJ_DARWINOS 1" >>confdefs.h - ac_target_arch=$ARCH_VAL - ;; + ac_target_arch=$ARCH_VAL + ;; *linux*) - printf "%s\n" "#define PJ_LINUX 1" >>confdefs.h + printf "%s\n" "#define PJ_LINUX 1" >>confdefs.h - ;; + ;; *bsd*) - printf "%s\n" "#define PJ_BSD 1" >>confdefs.h + printf "%s\n" "#define PJ_BSD 1" >>confdefs.h - ;; + ;; *rtems*) - printf "%s\n" "#define PJ_RTEMS 1" >>confdefs.h + printf "%s\n" "#define PJ_RTEMS 1" >>confdefs.h - ;; + ;; *sunos* | *solaris* ) - printf "%s\n" "#define PJ_SUNOS 1" >>confdefs.h + printf "%s\n" "#define PJ_SUNOS 1" >>confdefs.h - ;; + ;; *) - ;; + ;; esac # Check whether --enable-floating-point was given. if test ${enable_floating_point+y} then : - enableval=$enable_floating_point; if test "$enable_floating_point" = "no"; then - printf "%s\n" "#define PJ_HAS_FLOATING_POINT 0" >>confdefs.h + enableval=$enable_floating_point; + if test "$enable_floating_point" = "no"; then + printf "%s\n" "#define PJ_HAS_FLOATING_POINT 0" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if floating point is disabled... yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if floating point is disabled... yes" >&5 printf "%s\n" "Checking if floating point is disabled... yes" >&6; } - fi + fi + else $as_nop - printf "%s\n" "#define PJ_HAS_FLOATING_POINT 1" >>confdefs.h + printf "%s\n" "#define PJ_HAS_FLOATING_POINT 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if floating point is disabled... no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if floating point is disabled... no" >&5 printf "%s\n" "Checking if floating point is disabled... no" >&6; } + fi @@ -5803,18 +5853,18 @@ fi case $target in *mingw* | *cygw* | *win32* | *w32* ) - printf "%s\n" "#define PJ_HAS_ERRNO_H 0" >>confdefs.h + printf "%s\n" "#define PJ_HAS_ERRNO_H 0" >>confdefs.h - ;; + ;; *) - ac_fn_c_check_header_compile "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default" if test "x$ac_cv_header_errno_h" = xyes then : printf "%s\n" "#define PJ_HAS_ERRNO_H 1" >>confdefs.h fi - ;; + ;; esac ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default" @@ -5866,15 +5916,17 @@ then : fi -ac_fn_c_check_header_compile "$LINENO" "netinet/ip.h" "ac_cv_header_netinet_ip_h" "#if PJ_HAS_SYS_TYPES_H - # include - #endif - #if PJ_HAS_NETINET_IN_SYSTM_H - # include - #endif - #if PJ_HAS_NETINET_IN_H - # include - #endif +ac_fn_c_check_header_compile "$LINENO" "netinet/ip.h" "ac_cv_header_netinet_ip_h" " + #if PJ_HAS_SYS_TYPES_H + # include + #endif + #if PJ_HAS_NETINET_IN_SYSTM_H + # include + #endif + #if PJ_HAS_NETINET_IN_H + # include + #endif + " if test "x$ac_cv_header_netinet_ip_h" = xyes @@ -5883,6 +5935,7 @@ then : fi + ac_fn_c_check_header_compile "$LINENO" "netinet/tcp.h" "ac_cv_header_netinet_tcp_h" "$ac_includes_default" if test "x$ac_cv_header_netinet_tcp_h" = xyes then : @@ -6063,11 +6116,13 @@ then : fi -ac_fn_c_check_header_compile "$LINENO" "mswsock.h" "ac_cv_header_mswsock_h" "#if PJ_HAS_WINSOCK2_H - # include - #elif PJ_HAS_WINSOCK_H - # include - #endif +ac_fn_c_check_header_compile "$LINENO" "mswsock.h" "ac_cv_header_mswsock_h" " + #if PJ_HAS_WINSOCK2_H + # include + #elif PJ_HAS_WINSOCK_H + # include + #endif + " if test "x$ac_cv_header_mswsock_h" = xyes @@ -6076,6 +6131,7 @@ then : fi + ac_fn_c_check_header_compile "$LINENO" "ws2tcpip.h" "ac_cv_header_ws2tcpip_h" "$ac_includes_default" if test "x$ac_cv_header_ws2tcpip_h" = xyes then : @@ -6089,13 +6145,14 @@ then : ac_has_uuid_h=1 fi -ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "#if PJ_HAS_SYS_TYPES_H - # include - #endif - #if PJ_HAS_SYS_SOCKET_H +ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" " + #if PJ_HAS_SYS_TYPES_H + # include + #endif + #if PJ_HAS_SYS_SOCKET_H + # include + #endif - # include - #endif " if test "x$ac_cv_header_net_if_h" = xyes @@ -6106,15 +6163,15 @@ fi case $target in - *android*) - ac_fn_c_check_header_compile "$LINENO" "linux/android_alarm.h" "ac_cv_header_linux_android_alarm_h" "$ac_includes_default" + *android*) + ac_fn_c_check_header_compile "$LINENO" "linux/android_alarm.h" "ac_cv_header_linux_android_alarm_h" "$ac_includes_default" if test "x$ac_cv_header_linux_android_alarm_h" = xyes then : printf "%s\n" "#define PJ_HAS_ANDROID_ALARM_H 1" >>confdefs.h fi - ;; + ;; esac ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r" @@ -6159,9 +6216,11 @@ printf "%s\n" "#define PJ_ATOMIC_VALUE_TYPE long" >>confdefs.h printf %s "checking if inet_aton() is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - #include - #include + + + #include + #include + #include int main (void) { @@ -6169,16 +6228,20 @@ inet_aton(0, 0); ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - printf "%s\n" "#define PJ_SOCK_HAS_INET_ATON 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + printf "%s\n" "#define PJ_SOCK_HAS_INET_ATON 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -6186,9 +6249,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext printf %s "checking if inet_pton() is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - #include - #include + + + #include + #include + #include int main (void) { @@ -6196,16 +6261,20 @@ inet_pton(0, 0, 0); ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - printf "%s\n" "#define PJ_SOCK_HAS_INET_PTON 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + printf "%s\n" "#define PJ_SOCK_HAS_INET_PTON 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -6213,9 +6282,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext printf %s "checking if inet_ntop() is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - #include - #include + + + #include + #include + #include int main (void) { @@ -6223,16 +6294,20 @@ inet_ntop(0, 0, 0, 0); ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - printf "%s\n" "#define PJ_SOCK_HAS_INET_NTOP 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + printf "%s\n" "#define PJ_SOCK_HAS_INET_NTOP 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -6240,9 +6315,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext printf %s "checking if getaddrinfo() is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - #include - #include + + + #include + #include + #include int main (void) { @@ -6250,16 +6327,20 @@ getaddrinfo(0, 0, 0, 0); ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - printf "%s\n" "#define PJ_SOCK_HAS_GETADDRINFO 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + printf "%s\n" "#define PJ_SOCK_HAS_GETADDRINFO 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -6267,8 +6348,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext printf %s "checking if socketpair() is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - #include + + + #include + #include int main (void) { @@ -6276,16 +6359,20 @@ socketpair(0, 0, 0, 0); ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - printf "%s\n" "#define PJ_SOCK_HAS_SOCKETPAIR 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + printf "%s\n" "#define PJ_SOCK_HAS_SOCKETPAIR 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -6293,10 +6380,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext printf %s "checking if sockaddr_in has sin_len member... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - #include - #include - #include + + + #include + #include + #include + #include int main (void) { @@ -6304,16 +6393,20 @@ struct sockaddr_in a; a.sin_len=0; ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - printf "%s\n" "#define PJ_SOCKADDR_HAS_LEN 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + printf "%s\n" "#define PJ_SOCKADDR_HAS_LEN 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -6321,8 +6414,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext printf %s "checking if socklen_t is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - #include + + + #include + #include int main (void) { @@ -6330,16 +6425,20 @@ socklen_t xxx = 0; ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - printf "%s\n" "#define PJ_HAS_SOCKLEN_T 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + printf "%s\n" "#define PJ_HAS_SOCKLEN_T 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -6347,8 +6446,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext printf %s "checking if IPV6_V6ONLY is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - #include + + + #include + #include int main (void) { @@ -6356,16 +6457,20 @@ int opt = IPV6_V6ONLY; ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - printf "%s\n" "#define PJ_SOCK_HAS_IPV6_V6ONLY 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + printf "%s\n" "#define PJ_SOCK_HAS_IPV6_V6ONLY 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -6373,18 +6478,20 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext printf %s "checking if SO_ERROR is available... " >&6; } case $target in *mingw* | *cygw* | *win32* | *w32* ) - printf "%s\n" "#define PJ_HAS_SO_ERROR 1" >>confdefs.h + printf "%s\n" "#define PJ_HAS_SO_ERROR 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - ;; + ;; *) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - #include - #include - #include + + + #include + #include + #include + #include int main (void) { @@ -6392,19 +6499,23 @@ int i=SO_ERROR; ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - printf "%s\n" "#define PJ_HAS_SO_ERROR 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + printf "%s\n" "#define PJ_HAS_SO_ERROR 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ;; + ;; esac @@ -6412,7 +6523,8 @@ esac printf %s "checking if pthread_rwlock_t is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + + #include int main (void) { @@ -6420,20 +6532,26 @@ pthread_rwlock_t *x; ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - printf "%s\n" "#define PJ_EMULATE_RWMUTEX 0" >>confdefs.h - ac_rwmutex="yes" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + printf "%s\n" "#define PJ_EMULATE_RWMUTEX 0" >>confdefs.h + + ac_rwmutex="yes" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } + else $as_nop - printf "%s\n" "#define PJ_EMULATE_RWMUTEX 1" >>confdefs.h - ac_rwmutex="no" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + printf "%s\n" "#define PJ_EMULATE_RWMUTEX 1" >>confdefs.h + + ac_rwmutex="no" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -6442,8 +6560,10 @@ if test "$ac_rwmutex" = "no"; then printf %s "checking if pthread_rwlock_t is available with _POSIX_READER_WRITER_LOCKS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#define _POSIX_READER_WRITER_LOCKS - #include + + + #define _POSIX_READER_WRITER_LOCKS + #include int main (void) { @@ -6451,19 +6571,25 @@ pthread_rwlock_t *x; ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - printf "%s\n" "#define PJ_EMULATE_RWMUTEX 0" >>confdefs.h - CFLAGS="$CFLAGS -D_POSIX_THREADS -D_POSIX_READER_WRITER_LOCKS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + printf "%s\n" "#define PJ_EMULATE_RWMUTEX 0" >>confdefs.h + + CFLAGS="$CFLAGS -D_POSIX_THREADS -D_POSIX_READER_WRITER_LOCKS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } + else $as_nop - printf "%s\n" "#define PJ_EMULATE_RWMUTEX 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + printf "%s\n" "#define PJ_EMULATE_RWMUTEX 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi @@ -6472,7 +6598,8 @@ fi printf %s "checking if pthread_mutexattr_settype() is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + + #include int main (void) { @@ -6480,16 +6607,20 @@ pthread_mutexattr_settype(0,PTHREAD_MUTEX_FAST_NP); ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - printf "%s\n" "#define PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + printf "%s\n" "#define PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -6497,25 +6628,29 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext printf %s "checking if pthread_mutexattr_t has recursive member... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + + #include int main (void) { -pthread_mutexattr_t attr; - attr.recursive=1; +pthread_mutexattr_t attr; attr.recursive=1; ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - printf "%s\n" "#define PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + printf "%s\n" "#define PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -6528,65 +6663,69 @@ ac_os_objs=ioqueue_select.o ac_linux_poll=select case $target in - *darwin* | *bsd*) - # Check whether --enable-kqueue was given. + *darwin* | *bsd*) + # Check whether --enable-kqueue was given. if test ${enable_kqueue+y} then : enableval=$enable_kqueue; - if test "$enable_kqueue" = "yes"; then - ac_os_objs=ioqueue_kqueue.o - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: kqueue()" >&5 + if test "$enable_kqueue" = "yes"; then + ac_os_objs=ioqueue_kqueue.o + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: kqueue()" >&5 printf "%s\n" "kqueue()" >&6; } - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: select()" >&5 + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: select()" >&5 printf "%s\n" "select()" >&6; } - fi + fi else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: select()" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: select()" >&5 printf "%s\n" "select()" >&6; } + fi - ;; - *) - # Check whether --enable-epoll was given. + ;; + *) + # Check whether --enable-epoll was given. if test ${enable_epoll+y} then : enableval=$enable_epoll; - if test "$enable_epoll" = "yes"; then - ac_os_objs=ioqueue_epoll.o - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: /dev/epoll" >&5 + if test "$enable_epoll" = "yes"; then + ac_os_objs=ioqueue_epoll.o + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: /dev/epoll" >&5 printf "%s\n" "/dev/epoll" >&6; } - printf "%s\n" "#define PJ_HAS_LINUX_EPOLL 1" >>confdefs.h + printf "%s\n" "#define PJ_HAS_LINUX_EPOLL 1" >>confdefs.h - ac_linux_poll=epoll - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: select()" >&5 + ac_linux_poll=epoll + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: select()" >&5 printf "%s\n" "select()" >&6; } - fi + fi else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: select()" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: select()" >&5 printf "%s\n" "select()" >&6; } + fi - ;; + ;; esac # Check whether --enable-shared was given. if test ${enable_shared+y} then : - enableval=$enable_shared; if test "$enable_shared" = "yes"; then - ac_shared_libraries=1 - CFLAGS="$CFLAGS -fPIC" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Building shared libraries... yes" >&5 + enableval=$enable_shared; + if test "$enable_shared" = "yes"; then + ac_shared_libraries=1 + CFLAGS="$CFLAGS -fPIC" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Building shared libraries... yes" >&5 printf "%s\n" "Building shared libraries... yes" >&6; } - fi + fi + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Building shared libraries... no" >&5 printf "%s\n" "Building shared libraries... no" >&6; } @@ -6598,11 +6737,13 @@ fi # Check whether --enable-pjsua2 was given. if test ${enable_pjsua2+y} then : - enableval=$enable_pjsua2; if test "$enable_pjsua2" = "no"; then - ac_no_pjsua2=1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Building pjsua2 library and application... no" >&5 + enableval=$enable_pjsua2; + if test "$enable_pjsua2" = "no"; then + ac_no_pjsua2=1 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Building pjsua2 library and application... no" >&5 printf "%s\n" "Building pjsua2 library and application... no" >&6; } - fi + fi + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Building pjsua2 library and application... yes" >&5 printf "%s\n" "Building pjsua2 library and application... yes" >&6; } @@ -6612,59 +6753,61 @@ fi case $target in - *mingw* | *cygw* | *win32* | *w32* ) - ac_os_objs="$ac_os_objs file_access_win32.o file_io_win32.o os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o sock_qos_bsd.o unicode_win32.o stack_win32.o" - ;; - *) - ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o stack.o" - case $target in - *-apple-darwin_ios*) - ac_os_objs="$ac_os_objs os_info_iphone.o os_core_darwin.o" - ;; - *darwin*) - ac_os_objs="$ac_os_objs os_core_darwin.o" - ;; - esac - # QoS - case $target in - *darwin*) - ac_os_objs="$ac_os_objs sock_qos_darwin.o sock_qos_bsd.o" - ;; - *) - ac_os_objs="$ac_os_objs sock_qos_bsd.o" - ;; - esac - # SSL - case $target in - *darwin*) - ac_os_objs="$ac_os_objs ssl_sock_apple.o" - ;; - esac - # UUID - case $target in - *android*) - ac_os_objs="$ac_os_objs guid_android.o" - ;; - *darwin*) - ac_os_objs="$ac_os_objs guid_darwin.o" - ;; - *bsd*) - ac_os_objs="$ac_os_objs guid_bsd.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 - ;; + *mingw* | *cygw* | *win32* | *w32* ) + ac_os_objs="$ac_os_objs file_access_win32.o file_io_win32.o os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o sock_qos_bsd.o unicode_win32.o" + ;; + *) + ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o" + case $target in + *-apple-darwin_ios*) + ac_os_objs="$ac_os_objs os_info_iphone.o os_core_darwin.o" + ;; + *darwin*) + ac_os_objs="$ac_os_objs os_core_darwin.o" + ;; + esac + + # QoS + case $target in + *darwin*) + ac_os_objs="$ac_os_objs sock_qos_darwin.o sock_qos_bsd.o" + ;; + *) + ac_os_objs="$ac_os_objs sock_qos_bsd.o" + ;; + esac + + # SSL + case $target in + *darwin*) + ac_os_objs="$ac_os_objs ssl_sock_apple.o" + ;; + esac + + # UUID + case $target in + *android*) + ac_os_objs="$ac_os_objs guid_android.o" + ;; + *darwin*) + ac_os_objs="$ac_os_objs guid_darwin.o" + ;; + *bsd*) + ac_os_objs="$ac_os_objs guid_bsd.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 - # Check whether --with-upnp was given. if test ${with_upnp+y} then : @@ -6683,64 +6826,68 @@ fi if test ${enable_upnp+y} then : enableval=$enable_upnp; - if test "$enable_upnp" = "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if UPnP is disabled... yes" >&5 + if test "$enable_upnp" = "no"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if UPnP is disabled... yes" >&5 printf "%s\n" "Checking if UPnP is disabled... yes" >&6; } - fi + fi else $as_nop - if test "x$with_upnp" != "xno" -a "x$with_upnp" != "x"; then - UPNP_PREFIX=$with_upnp - UPNP_CFLAGS="-I$UPNP_PREFIX/upnp/inc -I$UPNP_PREFIX/ixml/inc" - UPNP_LDFLAGS="-L$UPNP_PREFIX/upnp/.libs -L$UPNP_PREFIX/imxl/.libs" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using UPnP prefix... $with_upnp" >&5 + if test "x$with_upnp" != "xno" -a "x$with_upnp" != "x"; then + UPNP_PREFIX=$with_upnp + UPNP_CFLAGS="-I$UPNP_PREFIX/upnp/inc -I$UPNP_PREFIX/ixml/inc" + UPNP_LDFLAGS="-L$UPNP_PREFIX/upnp/.libs -L$UPNP_PREFIX/imxl/.libs" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using UPnP prefix... $with_upnp" >&5 printf "%s\n" "Using UPnP prefix... $with_upnp" >&6; } - else - UPNP_CFLAGS="" - UPNP_LDFLAGS="" - fi + else + UPNP_CFLAGS="" + UPNP_LDFLAGS="" + fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking UPnP usability" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking UPnP usability" >&5 printf %s "checking UPnP usability... " >&6; } - UPNP_LIBS="-lupnp -lixml" + UPNP_LIBS="-lupnp -lixml" - SAVED_LIBS="$LIBS" - SAVED_LDFLAGS="$LDFLAGS" - SAVED_CFLAGS="$CFLAGS" + SAVED_LIBS="$LIBS" + SAVED_LDFLAGS="$LDFLAGS" + SAVED_CFLAGS="$CFLAGS" - LIBS="$UPNP_LIBS $LIBS" - LDFLAGS="$UPNP_LDFLAGS $LDFLAGS" - CFLAGS="$UPNP_CFLAGS $CFLAGS" + LIBS="$UPNP_LIBS $LIBS" + LDFLAGS="$UPNP_LDFLAGS $LDFLAGS" + CFLAGS="$UPNP_CFLAGS $CFLAGS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + + + #include int main (void) { UpnpInit2(NULL, 0); - ; return 0; } + _ACEOF if ac_fn_c_try_link "$LINENO" then : - CFLAGS="$CFLAGS -DPJNATH_HAS_UPNP=1 $UPNP_CFLAGS" - LDFLAGS="$LDFLAGS $UPNP_LDFLAGS $UPNP_LIBS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + CFLAGS="$CFLAGS -DPJNATH_HAS_UPNP=1 $UPNP_CFLAGS" + LDFLAGS="$LDFLAGS $UPNP_LDFLAGS $UPNP_LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } else $as_nop - LIBS="$SAVED_LIBS" - LDFLAGS="$SAVED_LDFLAGS" - CFLAGS="$SAVED_CFLAGS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + LIBS="$SAVED_LIBS" + LDFLAGS="$SAVED_LDFLAGS" + CFLAGS="$SAVED_CFLAGS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -6757,15 +6904,16 @@ ac_external_speex=0 if test ${with_external_speex+y} then : withval=$with_external_speex; - if test "x$with_external_speex" != "xno"; then - # Test Speex installation - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external Speex devkit is installed" >&5 + if test "x$with_external_speex" != "xno"; then + # Test Speex installation + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external Speex devkit is installed" >&5 printf %s "checking if external Speex devkit is installed... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - #include + + #include + #include int main (void) { @@ -6773,20 +6921,25 @@ speex_echo_state_init(0, 0); speex_encoder_init(0); ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5 printf "%s\n" "yes!!" >&6; } - printf "%s\n" "#define PJMEDIA_EXTERNAL_SPEEX_CODEC 1" >>confdefs.h + printf "%s\n" "#define PJMEDIA_EXTERNAL_SPEEX_CODEC 1" >>confdefs.h - ac_external_speex="1" + ac_external_speex="1" else $as_nop - as_fn_error $? "Unable to use external Speex library. If Speex development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5 + + as_fn_error $? "Unable to use external Speex library. If Speex development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5 + + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - fi + fi fi @@ -6799,13 +6952,14 @@ ac_external_gsm=0 if test ${with_external_gsm+y} then : withval=$with_external_gsm; - if test "x$with_external_gsm" != "xno"; then - # Test GSM library installation - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external GSM devkit is installed as gsm/gsm.h" >&5 + if test "x$with_external_gsm" != "xno"; then + # Test GSM library installation + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external GSM devkit is installed as gsm/gsm.h" >&5 printf %s "checking if external GSM devkit is installed as gsm/gsm.h... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + + #include int main (void) { @@ -6813,26 +6967,30 @@ gsm_create(); ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5 printf "%s\n" "yes!!" >&6; } - printf "%s\n" "#define PJMEDIA_EXTERNAL_GSM_CODEC 1" >>confdefs.h + printf "%s\n" "#define PJMEDIA_EXTERNAL_GSM_CODEC 1" >>confdefs.h - printf "%s\n" "#define PJMEDIA_EXTERNAL_GSM_GSM_H 1" >>confdefs.h + printf "%s\n" "#define PJMEDIA_EXTERNAL_GSM_GSM_H 1" >>confdefs.h - ac_external_gsm="1" + ac_external_gsm="1" else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external GSM devkit is installed as gsm.h" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external GSM devkit is installed as gsm.h" >&5 printf %s "checking if external GSM devkit is installed as gsm.h... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + + + #include int main (void) { @@ -6840,19 +6998,22 @@ gsm_create(); ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5 printf "%s\n" "yes!!" >&6; } - printf "%s\n" "#define PJMEDIA_EXTERNAL_GSM_CODEC 1" >>confdefs.h + printf "%s\n" "#define PJMEDIA_EXTERNAL_GSM_CODEC 1" >>confdefs.h - printf "%s\n" "#define PJMEDIA_EXTERNAL_GSM_H 1" >>confdefs.h + printf "%s\n" "#define PJMEDIA_EXTERNAL_GSM_H 1" >>confdefs.h - ac_external_gsm="1" + ac_external_gsm="1" else $as_nop - as_fn_error $? "Unable to use external GSM library. If GSM development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5 + + as_fn_error $? "Unable to use external GSM library. If GSM development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5 fi @@ -6861,7 +7022,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - fi + fi fi @@ -6876,14 +7037,15 @@ ac_external_srtp=0 if test ${with_external_srtp+y} then : withval=$with_external_srtp; - if test "x$with_external_srtp" != "xno"; then - # Test SRTP installation - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external SRTP devkit is installed" >&5 + if test "x$with_external_srtp" != "xno"; then + # Test SRTP installation + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external SRTP devkit is installed" >&5 printf %s "checking if external SRTP devkit is installed... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + + #include int main (void) { @@ -6891,19 +7053,23 @@ srtp_init(); ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes: version 2.x" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes: version 2.x" >&5 printf "%s\n" "yes: version 2.x" >&6; } - ac_external_srtp="2" - ac_external_srtp_lib="srtp2" + ac_external_srtp="2" + ac_external_srtp_lib="srtp2" else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + + #include int main (void) { @@ -6911,32 +7077,39 @@ srtp_init(); ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes: version 1.x" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes: version 1.x" >&5 printf "%s\n" "yes: version 1.x" >&6; } - ac_external_srtp="1" - ac_external_srtp_lib="srtp" + ac_external_srtp="1" + ac_external_srtp_lib="srtp" else $as_nop - as_fn_error $? "Unable to use SRTP. If SRTP development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5 + + as_fn_error $? "Unable to use SRTP. If SRTP development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5 + + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - fi + fi fi if test "x$ac_external_srtp" != "x0"; then - ac_srtp_deinit_present=0 + ac_srtp_deinit_present=0 - ac_srtp_shutdown_present=0 + ac_srtp_shutdown_present=0 - as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ac_external_srtp_lib""_srtp_deinit" | $as_tr_sh` + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ac_external_srtp_lib""_srtp_deinit" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for srtp_deinit in -l$ac_external_srtp_lib" >&5 printf %s "checking for srtp_deinit in -l$ac_external_srtp_lib... " >&6; } if eval test \${$as_ac_Lib+y} @@ -6978,8 +7151,8 @@ then : ac_srtp_deinit_present=1 fi - if test "x$ac_srtp_deinit_present" != "x1"; then - as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ac_external_srtp_lib""_srtp_shutdown" | $as_tr_sh` + if test "x$ac_srtp_deinit_present" != "x1"; then + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ac_external_srtp_lib""_srtp_shutdown" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for srtp_shutdown in -l$ac_external_srtp_lib" >&5 printf %s "checking for srtp_shutdown in -l$ac_external_srtp_lib... " >&6; } if eval test \${$as_ac_Lib+y} @@ -7021,10 +7194,9 @@ then : ac_srtp_shutdown_present=1 fi - fi + fi fi - ac_external_yuv=0 @@ -7032,13 +7204,15 @@ ac_external_yuv=0 if test ${with_external_yuv+y} then : withval=$with_external_yuv; - if test "x$with_external_yuv" != "xno"; then - # Test libyuv installation - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external libyuv devkit is installed" >&5 + if test "x$with_external_yuv" != "xno"; then + # Test libyuv installation + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external libyuv devkit is installed" >&5 printf %s "checking if external libyuv devkit is installed... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + + + #include int main (void) { @@ -7046,18 +7220,23 @@ RGB24ToI420(0,0,0,0,0,0,0,0,0,0); ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5 printf "%s\n" "yes!!" >&6; } - ac_external_yuv="1" + ac_external_yuv="1" else $as_nop - as_fn_error $? "Unable to use external libyuv. If libyuv development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5 + + as_fn_error $? "Unable to use external libyuv. If libyuv development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5 + + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - fi + fi fi @@ -7071,15 +7250,16 @@ ac_external_webrtc=0 if test ${with_external_webrtc+y} then : withval=$with_external_webrtc; - if test "x$with_external_webrtc" != "xno"; then - # Test webrtc installation - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external webrtc devkit is installed" >&5 + if test "x$with_external_webrtc" != "xno"; then + # Test webrtc installation + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external webrtc devkit is installed" >&5 printf %s "checking if external webrtc devkit is installed... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - #include + + #include + #include int main (void) { @@ -7087,18 +7267,23 @@ WebRtcAec_Create(); ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5 printf "%s\n" "yes!!" >&6; } - ac_external_webrtc="1" + ac_external_webrtc="1" else $as_nop - as_fn_error $? "Unable to use external webrtc. If webrtc development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5 + + as_fn_error $? "Unable to use external webrtc. If webrtc development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5 + + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - fi + fi fi @@ -7112,14 +7297,15 @@ ac_external_webrtc_aec3=0 if test ${with_external_webrtc_aec3+y} then : withval=$with_external_webrtc_aec3; - if test "x$with_external_webrtc_aec3" != "xno"; then - # Test webrtc AEC3 installation - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external webrtc AEC3 is installed" >&5 + if test "x$with_external_webrtc_aec3" != "xno"; then + # Test webrtc AEC3 installation + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external webrtc AEC3 is installed" >&5 printf %s "checking if external webrtc AEC3 is installed... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include "modules/audio_processing/aec3/echo_canceller3.h" + + #include "modules/audio_processing/aec3/echo_canceller3.h" int main (void) { @@ -7127,18 +7313,23 @@ EchoCanceller3 ec(EchoCanceller3Config(), 16000, 1, 1); ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5 printf "%s\n" "yes!!" >&6; } - ac_external_webrtc_aec3="1" + ac_external_webrtc_aec3="1" else $as_nop - as_fn_error $? "Unable to use external webrtc AEC3. If webrtc development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5 + + as_fn_error $? "Unable to use external webrtc AEC3. If webrtc development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5 + + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - fi + fi fi @@ -7150,11 +7341,13 @@ ac_pjmedia_resample=libresample # Check whether --enable-resample was given. if test ${enable_resample+y} then : - enableval=$enable_resample; if test "$enable_resample" = "no"; then - ac_pjmedia_resample=none - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if resampling is disabled...yes" >&5 + enableval=$enable_resample; + if test "$enable_resample" = "no"; then + ac_pjmedia_resample=none + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if resampling is disabled...yes" >&5 printf "%s\n" "Checking if resampling is disabled...yes" >&6; } - fi + fi + fi @@ -7163,11 +7356,13 @@ fi # Check whether --enable-sound was given. if test ${enable_sound+y} then : - enableval=$enable_sound; if test "$enable_sound" = "no"; then - ac_pjmedia_snd=null - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if sound is disabled... yes" >&5 + enableval=$enable_sound; + if test "$enable_sound" = "no"; then + ac_pjmedia_snd=null + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if sound is disabled... yes" >&5 printf "%s\n" "Checking if sound is disabled... yes" >&6; } - fi + fi + fi @@ -7179,14 +7374,15 @@ ac_external_pa=0 if test ${with_external_pa+y} then : withval=$with_external_pa; - if test "x$with_external_pa" != "xno"; then - # Test PortAudio installation - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external PortAudio devkit is installed" >&5 + if test "x$with_external_pa" != "xno"; then + # Test PortAudio installation + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external PortAudio devkit is installed" >&5 printf %s "checking if external PortAudio devkit is installed... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + + #include int main (void) { @@ -7194,18 +7390,23 @@ Pa_Initialize(); ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5 printf "%s\n" "yes!!" >&6; } - ac_external_pa="1" + ac_external_pa="1" else $as_nop - as_fn_error $? "Unable to use PortAudio. If PortAudio development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5 + + as_fn_error $? "Unable to use PortAudio. If PortAudio development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5 + + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - fi + fi fi @@ -7232,87 +7433,90 @@ fi if test "x$ac_cv_c_bigendian" = "xyes"; then - ac_pa_cflags="$ac_pa_cflags -DPA_BIG_ENDIAN" + ac_pa_cflags="$ac_pa_cflags -DPA_BIG_ENDIAN" else - ac_pa_cflags="$ac_pa_cflags -DPA_LITTLE_ENDIAN" + ac_pa_cflags="$ac_pa_cflags -DPA_LITTLE_ENDIAN" fi - # Check whether --with-oboe was given. if test ${with_oboe+y} then : withval=$with_oboe; - if test "x$with_oboe" != "xno" -a "x$with_oboe" != "x"; then - OBOE_PREFIX=$with_oboe - OBOE_CFLAGS="-I$OBOE_PREFIX/prefab/modules/oboe/include" - OBOE_LDFLAGS="-L$OBOE_PREFIX/prefab/modules/oboe/libs/android.$TARGET_ABI" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using Oboe prefix... $with_oboe" >&5 + if test "x$with_oboe" != "xno" -a "x$with_oboe" != "x"; then + OBOE_PREFIX=$with_oboe + OBOE_CFLAGS="-I$OBOE_PREFIX/prefab/modules/oboe/include" + OBOE_LDFLAGS="-L$OBOE_PREFIX/prefab/modules/oboe/libs/android.$TARGET_ABI" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using Oboe prefix... $with_oboe" >&5 printf "%s\n" "Using Oboe prefix... $with_oboe" >&6; } - else - OBOE_CFLAGS="" - OBOE_LDFLAGS="" - fi + else + OBOE_CFLAGS="" + OBOE_LDFLAGS="" + fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oboe usability" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oboe usability" >&5 printf %s "checking Oboe usability... " >&6; } - OBOE_LIBS="-loboe -lOpenSLES -llog" + OBOE_LIBS="-loboe -lOpenSLES -llog" - SAVED_LIBS="$LIBS" - SAVED_LDFLAGS="$LDFLAGS" - SAVED_CXXFLAGS="$CXXFLAGS" + SAVED_LIBS="$LIBS" + SAVED_LDFLAGS="$LDFLAGS" + SAVED_CXXFLAGS="$CXXFLAGS" - LIBS="$OBOE_LIBS $LIBS" - LDFLAGS="$OBOE_LDFLAGS $LDFLAGS" - CXXFLAGS="$OBOE_CFLAGS $CXXFLAGS" + LIBS="$OBOE_LIBS $LIBS" + LDFLAGS="$OBOE_LDFLAGS $LDFLAGS" + CXXFLAGS="$OBOE_CFLAGS $CXXFLAGS" - ac_ext=cpp + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + + + #include int main (void) { oboe::AudioStreamBuilder sb; sb.setDeviceId(0); - ; return 0; } + _ACEOF if ac_fn_cxx_try_link "$LINENO" then : - ac_oboe_cflags="-DPJMEDIA_AUDIO_DEV_HAS_OBOE=1 $OBOE_CFLAGS" - ac_oboe_ldflags="$OBOE_LDFLAGS $OBOE_LIBS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + ac_oboe_cflags="-DPJMEDIA_AUDIO_DEV_HAS_OBOE=1 $OBOE_CFLAGS" + ac_oboe_ldflags="$OBOE_LDFLAGS $OBOE_LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } else $as_nop - LIBS="$SAVED_LIBS" - LDFLAGS="$SAVED_LDFLAGS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + LIBS="$SAVED_LIBS" + LDFLAGS="$SAVED_LDFLAGS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - ac_ext=c + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - # Put back original CXXFLAGS as app won't needed it. - CXXFLAGS="$SAVED_CFLAGS" + # Put back original CXXFLAGS as app won't needed it. + CXXFLAGS="$SAVED_CFLAGS" fi @@ -7320,126 +7524,129 @@ fi if test "$enable_sound" = "no"; then - true; + true; else - case $target in - *android*) - if test "x$ac_oboe_cflags" != "x"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... Oboe" >&5 + case $target in + *android*) + if test "x$ac_oboe_cflags" != "x"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... Oboe" >&5 printf "%s\n" "Checking sound device backend... Oboe" >&6; } - else - LIBS="$LIBS -lOpenSLES" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... Android" >&5 + else + LIBS="$LIBS -lOpenSLES" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... Android" >&5 printf "%s\n" "Checking sound device backend... Android" >&6; } - fi - ;; - *-apple-darwin_ios*) - LIBS="$LIBS -framework CoreAudio -framework CoreFoundation -framework AudioToolbox -framework CFNetwork -framework UIKit -framework AVFoundation" - ac_pjmedia_audiodev_objs="coreaudio_dev.o" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... AudioUnit" >&5 + fi + ;; + *-apple-darwin_ios*) + LIBS="$LIBS -framework CoreAudio -framework CoreFoundation -framework AudioToolbox -framework CFNetwork -framework UIKit -framework AVFoundation" + ac_pjmedia_audiodev_objs="coreaudio_dev.o" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... AudioUnit" >&5 printf "%s\n" "Checking sound device backend... AudioUnit" >&6; } - ;; - *darwin*) - LIBS="$LIBS -framework CoreAudio -framework CoreServices -framework AudioUnit -framework AudioToolbox" - ac_pjmedia_audiodev_objs="coreaudio_dev.o" - if test "`uname -r`" = "6.8"; then - #ac_pa_cflags="$ac_pa_cflags -DPA_OLD_CORE_AUDIO -DMOSX_USE_NON_ATOMIC_FLAG_BITS" - #AC_MSG_RESULT([Setting additional PortAudio CFLAGS.. -DPA_OLD_CORE_AUDIO -DMOSX_USE_NON_ATOMIC_FLAG_BITS]) - #ac_pjmedia_snd=pa_old_darwinos - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... old coreaudio" >&5 + ;; + *darwin*) + LIBS="$LIBS -framework CoreAudio -framework CoreServices -framework AudioUnit -framework AudioToolbox" + ac_pjmedia_audiodev_objs="coreaudio_dev.o" + if test "`uname -r`" = "6.8"; then + #ac_pa_cflags="$ac_pa_cflags -DPA_OLD_CORE_AUDIO -DMOSX_USE_NON_ATOMIC_FLAG_BITS" + #AC_MSG_RESULT([Setting additional PortAudio CFLAGS.. -DPA_OLD_CORE_AUDIO -DMOSX_USE_NON_ATOMIC_FLAG_BITS]) + #ac_pjmedia_snd=pa_old_darwinos + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... old coreaudio" >&5 printf "%s\n" "Checking sound device backend... old coreaudio" >&6; } - else - ac_pjmedia_snd=coreaudio - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... coreaudio" >&5 + else + ac_pjmedia_snd=coreaudio + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... coreaudio" >&5 printf "%s\n" "Checking sound device backend... coreaudio" >&6; } - fi - ;; - *cygwin* | *mingw*) - ac_pjmedia_snd=win32 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... win32 sound" >&5 + fi + ;; + *cygwin* | *mingw*) + ac_pjmedia_snd=win32 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... win32 sound" >&5 printf "%s\n" "Checking sound device backend... win32 sound" >&6; } - ;; - *rtems*) - ac_pjmedia_snd=null - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... null sound" >&5 + ;; + *rtems*) + ac_pjmedia_snd=null + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... null sound" >&5 printf "%s\n" "Checking sound device backend... null sound" >&6; } - ;; - *) - if test "x$ac_external_pa" != "x1"; then - ac_fn_c_check_header_compile "$LINENO" "alsa/version.h" "ac_cv_header_alsa_version_h" "$ac_includes_default" + ;; + *) + if test "x$ac_external_pa" != "x1"; then + ac_fn_c_check_header_compile "$LINENO" "alsa/version.h" "ac_cv_header_alsa_version_h" "$ac_includes_default" if test "x$ac_cv_header_alsa_version_h" = xyes then : LIBS="$LIBS -lasound" - ac_pjmedia_snd=alsa + ac_pjmedia_snd=alsa fi - if test "x$ac_pjmedia_snd" = "xalsa"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... alsa" >&5 + if test "x$ac_pjmedia_snd" = "xalsa"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... alsa" >&5 printf "%s\n" "Checking sound device backend... alsa" >&6; } - else - ac_pjmedia_snd=null - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... null sound" >&5 + else + ac_pjmedia_snd=null + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... null sound" >&5 printf "%s\n" "Checking sound device backend... null sound" >&6; } - fi - fi - ;; - esac + fi + fi + ;; + esac fi # Disable video on mingw by default (but respect --enable-video=yes) case $target in - *mingw*) - if test ! "$enable_video" = "yes"; then - enable_video="no" - fi - ;; + *mingw*) + if test ! "$enable_video" = "yes"; then + enable_video="no" + fi + ;; esac # Check whether --enable-video was given. if test ${enable_video+y} then : - enableval=$enable_video; if test "$enable_video" = "no"; then - #AC_DEFINE(PJMEDIA_HAS_VIDEO,0) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Video is disabled" >&5 + enableval=$enable_video; + if test "$enable_video" = "no"; then + #AC_DEFINE(PJMEDIA_HAS_VIDEO,0) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Video is disabled" >&5 printf "%s\n" "Video is disabled" >&6; } - enable_sdl="no" - enable_ffmpeg="no" - enable_v4l2="no" - enable_openh264="no" - enable_libyuv="no" - enable_vpx="no" - fi + enable_sdl="no" + enable_ffmpeg="no" + enable_v4l2="no" + enable_openh264="no" + enable_libyuv="no" + enable_vpx="no" + fi + fi case $target in - *android*) - LIBS="$LIBS -llog" - ;; - *-apple-darwin_ios*) - LIBS="$LIBS -framework UIKit" - ;; - *darwin*) - LIBS="$LIBS -framework Foundation -framework AppKit" - ;; + *android*) + LIBS="$LIBS -llog" + ;; + *-apple-darwin_ios*) + LIBS="$LIBS -framework UIKit" + ;; + *darwin*) + LIBS="$LIBS -framework Foundation -framework AppKit" + ;; esac if test "$enable_video" = "no"; then - true; + true; else - case $target in - *android*) - ac_pjmedia_video=android_os + case $target in + *android*) + ac_pjmedia_video=android_os - SAVED_LIBS="$LIBS" - LIBS="-lGLESv2 -lEGL -landroid -lc" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + SAVED_LIBS="$LIBS" + LIBS="-lGLESv2 -lEGL -landroid -lc" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -7447,49 +7654,52 @@ main (void) ; return 0; } + _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_pjmedia_video_has_android=yes else $as_nop ac_pjmedia_video_has_android=no + fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="$SAVED_LIBS" - if test "$ac_pjmedia_video_has_android" = "yes"; then - ac_android_cflags="-DPJMEDIA_VIDEO_DEV_HAS_ANDROID_OPENGL=1" - LIBS="$LIBS -lGLESv2 -lEGL -landroid" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGL ES 2 is available... yes" >&5 + LIBS="$SAVED_LIBS" + if test "$ac_pjmedia_video_has_android" = "yes"; then + ac_android_cflags="-DPJMEDIA_VIDEO_DEV_HAS_ANDROID_OPENGL=1" + LIBS="$LIBS -lGLESv2 -lEGL -landroid" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGL ES 2 is available... yes" >&5 printf "%s\n" "Checking if OpenGL ES 2 is available... yes" >&6; } - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGL ES 2 is available... no" >&5 + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGL ES 2 is available... no" >&5 printf "%s\n" "Checking if OpenGL ES 2 is available... no" >&6; } - fi - ac_android_cflags="$ac_android_cflags -DPJMEDIA_VIDEO_DEV_HAS_ANDROID=1" - ;; - *mingw*) - if test "$enable_video" = "yes"; then - ac_pjmedia_video=windows_os + fi + ac_android_cflags="$ac_android_cflags -DPJMEDIA_VIDEO_DEV_HAS_ANDROID=1" + ;; + *mingw*) + if test "$enable_video" = "yes"; then + ac_pjmedia_video=windows_os - ac_pjmedia_video_dev_has_dshow=yes + ac_pjmedia_video_dev_has_dshow=yes - ac_dshow_cflags="-DPJMEDIA_HAS_VIDEO=1 -DPJMEDIA_VIDEO_DEV_HAS_DSHOW=1" + ac_dshow_cflags="-DPJMEDIA_HAS_VIDEO=1 -DPJMEDIA_VIDEO_DEV_HAS_DSHOW=1" + + ac_dshow_ldflags=" -lstdc++ -lquartz -lole32 -loleaut32 -lrpcrt4 -lwinmm -luuid -lmingwex -lstrmiids " + LIBS="$LIBS -lstdc++ -lquartz -lole32 -loleaut32 -lrpcrt4 -lwinmm -luuid -lmingwex -lstrmiids " + fi + ;; + *darwin*) + ac_pjmedia_video=darwin_os - ac_dshow_ldflags=" -lstdc++ -lquartz -lole32 -loleaut32 -lrpcrt4 -lwinmm -luuid -lmingwex -lstrmiids " - LIBS="$LIBS -lstdc++ -lquartz -lole32 -loleaut32 -lrpcrt4 -lwinmm -luuid -lmingwex -lstrmiids " - fi - ;; - *darwin*) - ac_pjmedia_video=darwin_os + SAVED_LIBS="$LIBS" - SAVED_LIBS="$LIBS" - LIBS="-framework AVFoundation -framework CoreGraphics -framework QuartzCore -framework CoreVideo -framework CoreMedia" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + LIBS="-framework AVFoundation -framework CoreGraphics -framework QuartzCore -framework CoreVideo -framework CoreMedia" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -7505,11 +7715,13 @@ then : ac_pjmedia_video_has_darwin=yes else $as_nop ac_pjmedia_video_has_darwin=no + fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="-framework VideoToolbox" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + LIBS="-framework VideoToolbox" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -7528,8 +7740,9 @@ else $as_nop fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="-framework Metal" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + LIBS="-framework Metal" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -7548,8 +7761,9 @@ else $as_nop fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="-framework OpenGLES" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + LIBS="-framework OpenGLES" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -7568,51 +7782,56 @@ else $as_nop fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="$SAVED_LIBS" - if test "$ac_pjmedia_video_has_darwin" = "yes"; then - ac_darwin_cflags="-DPJMEDIA_VIDEO_DEV_HAS_DARWIN=1" - LIBS="$LIBS -framework AVFoundation -framework CoreGraphics -framework QuartzCore -framework CoreVideo -framework CoreMedia" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if AVFoundation framework is available... yes" >&5 + + LIBS="$SAVED_LIBS" + if test "$ac_pjmedia_video_has_darwin" = "yes"; then + ac_darwin_cflags="-DPJMEDIA_VIDEO_DEV_HAS_DARWIN=1" + LIBS="$LIBS -framework AVFoundation -framework CoreGraphics -framework QuartzCore -framework CoreVideo -framework CoreMedia" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if AVFoundation framework is available... yes" >&5 printf "%s\n" "Checking if AVFoundation framework is available... yes" >&6; } - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if AVFoundation framework is available... no" >&5 + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if AVFoundation framework is available... no" >&5 printf "%s\n" "Checking if AVFoundation framework is available... no" >&6; } - fi - if test "$ac_pjmedia_video_has_metal" = "yes"; then - ac_darwin_cflags+=" -DPJMEDIA_VIDEO_DEV_HAS_METAL=1" - LIBS="$LIBS -framework Metal -framework MetalKit" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Metal framework is available... yes" >&5 + fi + + if test "$ac_pjmedia_video_has_metal" = "yes"; then + ac_darwin_cflags+=" -DPJMEDIA_VIDEO_DEV_HAS_METAL=1" + LIBS="$LIBS -framework Metal -framework MetalKit" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Metal framework is available... yes" >&5 printf "%s\n" "Checking if Metal framework is available... yes" >&6; } - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Metal framework is available... no" >&5 + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Metal framework is available... no" >&5 printf "%s\n" "Checking if Metal framework is available... no" >&6; } - fi - if test "$ac_pjmedia_video_has_vtoolbox" = "yes"; then - #ac_darwin_cflags+=" -DPJMEDIA_HAS_VID_TOOLBOX_CODEC=1" - LIBS="$LIBS -framework VideoToolbox" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if VideoToolbox framework is available... yes" >&5 + fi + + if test "$ac_pjmedia_video_has_vtoolbox" = "yes"; then + #ac_darwin_cflags+=" -DPJMEDIA_HAS_VID_TOOLBOX_CODEC=1" + LIBS="$LIBS -framework VideoToolbox" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if VideoToolbox framework is available... yes" >&5 printf "%s\n" "Checking if VideoToolbox framework is available... yes" >&6; } - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if VideoToolbox framework is available... no" >&5 + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if VideoToolbox framework is available... no" >&5 printf "%s\n" "Checking if VideoToolbox framework is available... no" >&6; } - fi - if test "$ac_pjmedia_video_has_ios_opengl" = "yes"; then - ac_darwin_cflags+=" -DPJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL=1" - LIBS="$LIBS -framework OpenGLES" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGLES framework is available... yes" >&5 + fi + + if test "$ac_pjmedia_video_has_ios_opengl" = "yes"; then + ac_darwin_cflags+=" -DPJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL=1" + LIBS="$LIBS -framework OpenGLES" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGLES framework is available... yes" >&5 printf "%s\n" "Checking if OpenGLES framework is available... yes" >&6; } - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGLES framework is available... no" >&5 + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGLES framework is available... no" >&5 printf "%s\n" "Checking if OpenGLES framework is available... no" >&6; } - fi - if false; then - # QTKit is deprecated, see ticket #1931. - ac_pjmedia_video=mac_os + fi + + if false; then + # QTKit is deprecated, see ticket #1931. + ac_pjmedia_video=mac_os - SAVED_LIBS="$LIBS" - LIBS="-framework QTKit" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + SAVED_LIBS="$LIBS" + LIBS="-framework QTKit" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -7631,29 +7850,31 @@ else $as_nop fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="$SAVED_LIBS" - if test "$ac_pjmedia_video_has_qt" = "yes"; then - ac_qt_cflags="-DPJMEDIA_VIDEO_DEV_HAS_QT=1" - LIBS="$LIBS -framework QTKit -framework QuartzCore -framework OpenGL" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if QTKit framework is available... yes" >&5 + LIBS="$SAVED_LIBS" + if test "$ac_pjmedia_video_has_qt" = "yes"; then + ac_qt_cflags="-DPJMEDIA_VIDEO_DEV_HAS_QT=1" + LIBS="$LIBS -framework QTKit -framework QuartzCore -framework OpenGL" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if QTKit framework is available... yes" >&5 printf "%s\n" "Checking if QTKit framework is available... yes" >&6; } - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if QTKit framework is available... no" >&5 + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if QTKit framework is available... no" >&5 printf "%s\n" "Checking if QTKit framework is available... no" >&6; } - fi - fi - ;; - esac + fi + fi + ;; + esac fi # Check whether --enable-ext_sound was given. if test ${enable_ext_sound+y} then : - enableval=$enable_ext_sound; if test "$enable_ext_sound" = "yes"; then - ac_pjmedia_snd=external - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if external sound is set... yes" >&5 + enableval=$enable_ext_sound; + if test "$enable_ext_sound" = "yes"; then + ac_pjmedia_snd=external + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if external sound is set... yes" >&5 printf "%s\n" "Checking if external sound is set... yes" >&6; } - fi + fi + fi @@ -7662,14 +7883,17 @@ fi # Check whether --enable-small-filter was given. if test ${enable_small_filter+y} then : - enableval=$enable_small_filter; if test "$enable_small_filter" = "no"; then - ac_no_small_filter='-DPJMEDIA_HAS_SMALL_FILTER=0' - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if small filter is disabled... yes" >&5 + enableval=$enable_small_filter; + if test "$enable_small_filter" = "no"; then + ac_no_small_filter='-DPJMEDIA_HAS_SMALL_FILTER=0' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if small filter is disabled... yes" >&5 printf "%s\n" "Checking if small filter is disabled... yes" >&6; } - fi + fi + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if small filter is disabled... no" >&5 printf "%s\n" "Checking if small filter is disabled... no" >&6; } + fi @@ -7677,14 +7901,17 @@ fi # Check whether --enable-large-filter was given. if test ${enable_large_filter+y} then : - enableval=$enable_large_filter; if test "$enable_large_filter" = "no"; then - ac_no_large_filter='-DPJMEDIA_HAS_LARGE_FILTER=0' - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if large filter is disabled... yes" >&5 + enableval=$enable_large_filter; + if test "$enable_large_filter" = "no"; then + ac_no_large_filter='-DPJMEDIA_HAS_LARGE_FILTER=0' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if large filter is disabled... yes" >&5 printf "%s\n" "Checking if large filter is disabled... yes" >&6; } - fi + fi + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if large filter is disabled... no" >&5 printf "%s\n" "Checking if large filter is disabled... no" >&6; } + fi @@ -7692,14 +7919,17 @@ fi # Check whether --enable-speex-aec was given. if test ${enable_speex_aec+y} then : - enableval=$enable_speex_aec; if test "$enable_speex_aec" = "no"; then - ac_no_speex_aec='-DPJMEDIA_HAS_SPEEX_AEC=0' - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Speex AEC is disabled...yes" >&5 + enableval=$enable_speex_aec; + if test "$enable_speex_aec" = "no"; then + ac_no_speex_aec='-DPJMEDIA_HAS_SPEEX_AEC=0' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Speex AEC is disabled...yes" >&5 printf "%s\n" "Checking if Speex AEC is disabled...yes" >&6; } - fi + fi + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Speex AEC is disabled...no" >&5 printf "%s\n" "Checking if Speex AEC is disabled...no" >&6; } + fi @@ -7707,16 +7937,19 @@ fi # Check whether --enable-g711-codec was given. if test ${enable_g711_codec+y} then : - enableval=$enable_g711_codec; if test "$enable_g711_codec" = "no"; then - ac_no_g711_codec=1 - printf "%s\n" "#define PJMEDIA_HAS_G711_CODEC 0" >>confdefs.h + enableval=$enable_g711_codec; + if test "$enable_g711_codec" = "no"; then + ac_no_g711_codec=1 + printf "%s\n" "#define PJMEDIA_HAS_G711_CODEC 0" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if G.711 codec is disabled...yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if G.711 codec is disabled...yes" >&5 printf "%s\n" "Checking if G.711 codec is disabled...yes" >&6; } - fi + fi + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if G.711 codec is disabled...no" >&5 printf "%s\n" "Checking if G.711 codec is disabled...no" >&6; } + fi @@ -7725,34 +7958,39 @@ fi # Check whether --enable-l16-codec was given. if test ${enable_l16_codec+y} then : - enableval=$enable_l16_codec; if test "$enable_l16_codec" = "no"; then - ac_no_l16_codec=1 - printf "%s\n" "#define PJMEDIA_HAS_L16_CODEC 0" >>confdefs.h + enableval=$enable_l16_codec; + if test "$enable_l16_codec" = "no"; then + ac_no_l16_codec=1 + printf "%s\n" "#define PJMEDIA_HAS_L16_CODEC 0" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if L16 codecs are disabled...yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if L16 codecs are disabled...yes" >&5 printf "%s\n" "Checking if L16 codecs are disabled...yes" >&6; } - fi + fi + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if L16 codec is disabled...no" >&5 printf "%s\n" "Checking if L16 codec is disabled...no" >&6; } -fi +fi # Check whether --enable-gsm-codec was given. if test ${enable_gsm_codec+y} then : - enableval=$enable_gsm_codec; if test "$enable_gsm_codec" = "no"; then - ac_no_gsm_codec=1 - printf "%s\n" "#define PJMEDIA_HAS_GSM_CODEC 0" >>confdefs.h + enableval=$enable_gsm_codec; + if test "$enable_gsm_codec" = "no"; then + ac_no_gsm_codec=1 + printf "%s\n" "#define PJMEDIA_HAS_GSM_CODEC 0" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if GSM codec is disabled...yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if GSM codec is disabled...yes" >&5 printf "%s\n" "Checking if GSM codec is disabled...yes" >&6; } - fi + fi + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if GSM codec is disabled...no" >&5 printf "%s\n" "Checking if GSM codec is disabled...no" >&6; } + fi @@ -7760,16 +7998,19 @@ fi # Check whether --enable-g722-codec was given. if test ${enable_g722_codec+y} then : - enableval=$enable_g722_codec; if test "$enable_g722_codec" = "no"; then - ac_no_g722_codec=1 - printf "%s\n" "#define PJMEDIA_HAS_G722_CODEC 0" >>confdefs.h + enableval=$enable_g722_codec; + if test "$enable_g722_codec" = "no"; then + ac_no_g722_codec=1 + printf "%s\n" "#define PJMEDIA_HAS_G722_CODEC 0" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if G.722 codec is disabled...yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if G.722 codec is disabled...yes" >&5 printf "%s\n" "Checking if G.722 codec is disabled...yes" >&6; } - fi + fi + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if G.722 codec is disabled...no" >&5 printf "%s\n" "Checking if G.722 codec is disabled...no" >&6; } + fi @@ -7777,16 +8018,19 @@ fi # Check whether --enable-g7221-codec was given. if test ${enable_g7221_codec+y} then : - enableval=$enable_g7221_codec; if test "$enable_g7221_codec" = "no"; then - ac_no_g7221_codec=1 - printf "%s\n" "#define PJMEDIA_HAS_G7221_CODEC 0" >>confdefs.h + enableval=$enable_g7221_codec; + if test "$enable_g7221_codec" = "no"; then + ac_no_g7221_codec=1 + printf "%s\n" "#define PJMEDIA_HAS_G7221_CODEC 0" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if G.722.1 codec is disabled...yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if G.722.1 codec is disabled...yes" >&5 printf "%s\n" "Checking if G.722.1 codec is disabled...yes" >&6; } - fi + fi + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if G.722.1 codec is disabled...no" >&5 printf "%s\n" "Checking if G.722.1 codec is disabled...no" >&6; } + fi @@ -7794,16 +8038,19 @@ fi # Check whether --enable-speex-codec was given. if test ${enable_speex_codec+y} then : - enableval=$enable_speex_codec; if test "$enable_speex_codec" = "no"; then - ac_no_speex_codec=1 - printf "%s\n" "#define PJMEDIA_HAS_SPEEX_CODEC 0" >>confdefs.h + enableval=$enable_speex_codec; + if test "$enable_speex_codec" = "no"; then + ac_no_speex_codec=1 + printf "%s\n" "#define PJMEDIA_HAS_SPEEX_CODEC 0" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Speex codec is disabled...yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Speex codec is disabled...yes" >&5 printf "%s\n" "Checking if Speex codec is disabled...yes" >&6; } - fi + fi + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Speex codec is disabled...no" >&5 printf "%s\n" "Checking if Speex codec is disabled...no" >&6; } + fi @@ -7811,16 +8058,19 @@ fi # Check whether --enable-ilbc-codec was given. if test ${enable_ilbc_codec+y} then : - enableval=$enable_ilbc_codec; if test "$enable_ilbc_codec" = "no"; then - ac_no_ilbc_codec=1 - printf "%s\n" "#define PJMEDIA_HAS_ILBC_CODEC 0" >>confdefs.h + enableval=$enable_ilbc_codec; + if test "$enable_ilbc_codec" = "no"; then + ac_no_ilbc_codec=1 + printf "%s\n" "#define PJMEDIA_HAS_ILBC_CODEC 0" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if iLBC codec is disabled...yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if iLBC codec is disabled...yes" >&5 printf "%s\n" "Checking if iLBC codec is disabled...yes" >&6; } - fi + fi + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if iLBC codec is disabled...no" >&5 printf "%s\n" "Checking if iLBC codec is disabled...no" >&6; } + fi @@ -7828,10 +8078,10 @@ fi if test ${enable_libsamplerate+y} then : enableval=$enable_libsamplerate; - if test "$enable_libsamplerate" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libsamplerate is enabled...yes" >&5 + if test "$enable_libsamplerate" = "yes"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libsamplerate is enabled...yes" >&5 printf "%s\n" "Checking if libsamplerate is enabled...yes" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for src_new in -lsamplerate" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for src_new in -lsamplerate" >&5 printf %s "checking for src_new in -lsamplerate... " >&6; } if test ${ac_cv_lib_samplerate_src_new+y} then : @@ -7874,15 +8124,16 @@ then : fi - ac_pjmedia_resample=libsamplerate - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libsamplerate is enabled...no" >&5 + ac_pjmedia_resample=libsamplerate + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libsamplerate is enabled...no" >&5 printf "%s\n" "Checking if libsamplerate is enabled...no" >&6; } - fi + fi else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libsamplerate is enabled...no" >&5 printf "%s\n" "Checking if libsamplerate is enabled...no" >&6; } + fi @@ -7890,11 +8141,13 @@ fi # Check whether --enable-resample_dll was given. if test ${enable_resample_dll+y} then : - enableval=$enable_resample_dll; if test "$enable_resample_dll" = "yes"; then - ac_resample_dll=1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Building libresample as shared library... yes" >&5 + enableval=$enable_resample_dll; + if test "$enable_resample_dll" = "yes"; then + ac_resample_dll=1 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Building libresample as shared library... yes" >&5 printf "%s\n" "Building libresample as shared library... yes" >&6; } - fi + fi + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Building libresample as shared library... no" >&5 printf "%s\n" "Building libresample as shared library... no" >&6; } @@ -7906,18 +8159,19 @@ fi if test ${enable_speex_resample+y} then : enableval=$enable_speex_resample; - if test "$enable_speex_resample" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Speex resample is enabled... yes" >&5 + if test "$enable_speex_resample" = "yes"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Speex resample is enabled... yes" >&5 printf "%s\n" "Checking if Speex resample is enabled... yes" >&6; } - ac_pjmedia_resample=speex - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Speex resample is enabled... no" >&5 + ac_pjmedia_resample=speex + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Speex resample is enabled... no" >&5 printf "%s\n" "Checking if Speex resample is enabled... no" >&6; } - fi + fi else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Speex resample is enabled... no" >&5 printf "%s\n" "Checking if Speex resample is enabled... no" >&6; } + fi @@ -7933,24 +8187,24 @@ fi if test "x$ac_cross_compile" != "x" -a "x$with_sdl" = "xno"; then - enable_sdl=no + nable_sdl=no fi # Check whether --enable-sdl was given. if test ${enable_sdl+y} then : enableval=$enable_sdl; - if test "$enable_sdl" = "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if SDL is disabled... yes" >&5 + if test "$enable_sdl" = "no"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if SDL is disabled... yes" >&5 printf "%s\n" "Checking if SDL is disabled... yes" >&6; } - fi + fi else $as_nop - if test "x$with_sdl" != "xno" -a "x$with_sdl" != "x"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using SDL prefix... $with_sdl" >&5 + if test "x$with_sdl" != "xyes" -a "x$with_sdl" != "xno" -a "x$with_sdl" != "x"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using SDL prefix... $with_sdl" >&5 printf "%s\n" "Using SDL prefix... $with_sdl" >&6; } - for ac_prog in sdl2-config sdl-config + for ac_prog in sdl2-config sdl-config do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -8000,8 +8254,8 @@ fi test -n "$SDL_CONFIG" && break done - else - for ac_prog in sdl2-config sdl-config + else + for ac_prog in sdl2-config sdl-config do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -8051,28 +8305,28 @@ fi test -n "$SDL_CONFIG" && break done - fi + fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking SDL availability" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking SDL availability" >&5 printf %s "checking SDL availability... " >&6; } - if test "x$SDL_CONFIG" = "x"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 + if test "x$SDL_CONFIG" = "x"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 printf "%s\n" "not found" >&6; } - elif (sh -c "$SDL_CONFIG --version" | grep -e '^1\.3' -e '^2\.') then + elif (sh -c "$SDL_CONFIG --version" | grep -e '^1\.3' -e '^2\.') then - ac_sdl_cflags=`$SDL_CONFIG --cflags` - ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags" - ac_sdl_ldflags=`$SDL_CONFIG --libs` - ac_sdl_ldflags=`echo "${ac_sdl_ldflags}" | sed -e 's/-mwindows//g'` - LIBS="$LIBS $ac_sdl_ldflags" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Unsupported SDL version" >&5 + ac_sdl_cflags=`$SDL_CONFIG --cflags` + ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags" + ac_sdl_ldflags=`$SDL_CONFIG --libs` + ac_sdl_ldflags=`echo "${ac_sdl_ldflags}" | sed -e 's/-mwindows//g'` + LIBS="$LIBS $ac_sdl_ldflags" + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Unsupported SDL version" >&5 printf "%s\n" "Unsupported SDL version" >&6; } - fi + fi -fi +fi @@ -8094,123 +8348,74 @@ fi if test ${enable_ffmpeg+y} then : enableval=$enable_ffmpeg; - ac_has_ffmpeg=0 + ac_has_ffmpeg=0 - if test "$enable_ffmpeg" = "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if ffmpeg is disabled... yes" >&5 + if test "$enable_ffmpeg" = "no"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if ffmpeg is disabled... yes" >&5 printf "%s\n" "Checking if ffmpeg is disabled... yes" >&6; } - fi + fi else $as_nop - FFMPEG_PREFIX="" + FFMPEG_PREFIX="" - SAVED_PKG_CONFIG_PATH=$PKG_CONFIG_PATH - if test "x$with_ffmpeg" != "xno" -a "x$with_ffmpeg" != "x"; then - FFMPEG_PREFIX=$with_ffmpeg - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using ffmpeg prefix... $FFMPEG_PREFIX" >&5 + SAVED_PKG_CONFIG_PATH=$PKG_CONFIG_PATH + if test "x$with_ffmpeg" != "xyes" -a "x$with_ffmpeg" != "xno" -a "x$with_ffmpeg" != "x"; then + FFMPEG_PREFIX=$with_ffmpeg + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using ffmpeg prefix... $FFMPEG_PREFIX" >&5 printf "%s\n" "Using ffmpeg prefix... $FFMPEG_PREFIX" >&6; } - export PKG_CONFIG_PATH=$FFMPEG_PREFIX/lib/pkgconfig - fi - - for ac_prog in pkg-config "python pkgconfig.py" -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_PKG_CONFIG+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$PKG_CONFIG"; then - ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_PKG_CONFIG="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -PKG_CONFIG=$ac_cv_prog_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -printf "%s\n" "$PKG_CONFIG" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - test -n "$PKG_CONFIG" && break -done -test -n "$PKG_CONFIG" || PKG_CONFIG="none" - + export PKG_CONFIG_PATH=$FFMPEG_PREFIX/lib/pkgconfig + fi - if test "$PKG_CONFIG" != "none"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking ffmpeg packages" >&5 + if test "$PKG_CONFIG" != "none"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking ffmpeg packages" >&5 printf %s "checking ffmpeg packages... " >&6; } - av_pkg="" - if $PKG_CONFIG --exists libavdevice; then - ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVDEVICE=1" - av_pkg="$av_pkg libavdevice" - fi - if $PKG_CONFIG --exists libavformat; then - ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVFORMAT=1" - av_pkg="$av_pkg libavformat" - fi - if $PKG_CONFIG --exists libavcodec; then - ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVCODEC=1" - av_pkg="$av_pkg libavcodec" - fi - if $PKG_CONFIG --exists libswscale; then - ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBSWSCALE=1" - av_pkg="$av_pkg libswscale" - fi - if $PKG_CONFIG --exists libavutil; then - ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVUTIL=1" - av_pkg="$av_pkg libavutil" - fi - - if test "x$av_pkg" = "x"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none detected (check the prefix)! **" >&5 + av_pkg="" + if $PKG_CONFIG --exists libavdevice; then + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVDEVICE=1" + av_pkg="$av_pkg libavdevice" + fi + if $PKG_CONFIG --exists libavformat; then + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVFORMAT=1" + av_pkg="$av_pkg libavformat" + fi + if $PKG_CONFIG --exists libavcodec; then + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVCODEC=1" + av_pkg="$av_pkg libavcodec" + fi + if $PKG_CONFIG --exists libswscale; then + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBSWSCALE=1" + av_pkg="$av_pkg libswscale" + fi + if $PKG_CONFIG --exists libavutil; then + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVUTIL=1" + av_pkg="$av_pkg libavutil" + fi + + if test "x$av_pkg" = "x"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none detected (check the prefix)! **" >&5 printf "%s\n" "none detected (check the prefix)! **" >&6; } - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $av_pkg" >&5 + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $av_pkg" >&5 printf "%s\n" "$av_pkg" >&6; } - fi + fi - ac_ffmpeg_cflags="$ac_ffmpeg_cflags `$PKG_CONFIG --cflags $av_pkg`" - ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags `$PKG_CONFIG --libs $av_pkg`" + ac_ffmpeg_cflags="$ac_ffmpeg_cflags `$PKG_CONFIG --cflags $av_pkg`" + ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags `$PKG_CONFIG --libs $av_pkg`" - else + else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: *** Warning: neither pkg-config nor python is available, ffmpeg dependency cannot be calculated. If ffmpeg libraries are not detected, you need to specify the correct CFLAGS and LDFLAGS settings for ffmpeg prior to invoking configure ***" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: *** Warning: neither pkg-config nor python is available, ffmpeg dependency cannot be calculated. If ffmpeg libraries are not detected, you need to specify the correct CFLAGS and LDFLAGS settings for ffmpeg prior to invoking configure ***" >&5 printf "%s\n" "*** Warning: neither pkg-config nor python is available, ffmpeg dependency cannot be calculated. If ffmpeg libraries are not detected, you need to specify the correct CFLAGS and LDFLAGS settings for ffmpeg prior to invoking configure ***" >&6; } - LIBS="-L$FFMPEG_PREFIX/lib $LIBS" - LDFLAGS="-L$FFMPEG_PREFIX/lib $LDFLAGS" - CFLAGS="-I$FFMPEG_PREFIX/include $CFLAGS" + LIBS="-L$FFMPEG_PREFIX/lib $LIBS" + LDFLAGS="-L$FFMPEG_PREFIX/lib $LDFLAGS" + CFLAGS="-I$FFMPEG_PREFIX/include $CFLAGS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for avdevice_version in -lavdevice" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for avdevice_version in -lavdevice" >&5 printf %s "checking for avdevice_version in -lavdevice... " >&6; } if test ${ac_cv_lib_avdevice_avdevice_version+y} then : @@ -8247,13 +8452,13 @@ fi printf "%s\n" "$ac_cv_lib_avdevice_avdevice_version" >&6; } if test "x$ac_cv_lib_avdevice_avdevice_version" = xyes then : - ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVDEVICE=1" - ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavdevice" - + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVDEVICE=1" + ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavdevice" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for av_malloc in -lavutil" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for av_malloc in -lavutil" >&5 printf %s "checking for av_malloc in -lavutil... " >&6; } if test ${ac_cv_lib_avutil_av_malloc+y} then : @@ -8290,21 +8495,20 @@ fi printf "%s\n" "$ac_cv_lib_avutil_av_malloc" >&6; } if test "x$ac_cv_lib_avutil_av_malloc" = xyes then : - ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVUTIL=1" - ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavutil" - + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVUTIL=1" + ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavutil" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for avcodec_init in -lavcodec" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for avcodec_init in -lavcodec" >&5 printf %s "checking for avcodec_init in -lavcodec... " >&6; } if test ${ac_cv_lib_avcodec_avcodec_init+y} then : printf %s "(cached) " >&6 else $as_nop ac_check_lib_save_LIBS=$LIBS -LIBS="-lavcodec -lavutil - $LIBS" +LIBS="-lavcodec -lavutil $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8334,20 +8538,20 @@ fi printf "%s\n" "$ac_cv_lib_avcodec_avcodec_init" >&6; } if test "x$ac_cv_lib_avcodec_avcodec_init" = xyes then : - ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVCODEC=1" - ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavcodec" + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVCODEC=1" + ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavcodec" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for av_register_all in -lavformat" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for av_register_all in -lavformat" >&5 printf %s "checking for av_register_all in -lavformat... " >&6; } if test ${ac_cv_lib_avformat_av_register_all+y} then : printf %s "(cached) " >&6 else $as_nop ac_check_lib_save_LIBS=$LIBS -LIBS="-lavformat -lavcodec -lavutil - $LIBS" +LIBS="-lavformat -lavcodec -lavutil $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8377,20 +8581,20 @@ fi printf "%s\n" "$ac_cv_lib_avformat_av_register_all" >&6; } if test "x$ac_cv_lib_avformat_av_register_all" = xyes then : - ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVFORMAT=1" - ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavformat" + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVFORMAT=1" + ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavformat" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sws_scale in -lswscale" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sws_scale in -lswscale" >&5 printf %s "checking for sws_scale in -lswscale... " >&6; } if test ${ac_cv_lib_swscale_sws_scale+y} then : printf %s "(cached) " >&6 else $as_nop ac_check_lib_save_LIBS=$LIBS -LIBS="-lswscale -lavutil - $LIBS" +LIBS="-lswscale -lavutil $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8420,12 +8624,13 @@ fi printf "%s\n" "$ac_cv_lib_swscale_sws_scale" >&6; } if test "x$ac_cv_lib_swscale_sws_scale" = xyes then : - ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBSWSCALE=1" - ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lswscale" + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBSWSCALE=1" + ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lswscale" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for avcore_version in -lavcore" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for avcore_version in -lavcore" >&5 printf %s "checking for avcore_version in -lavcore... " >&6; } if test ${ac_cv_lib_avcore_avcore_version+y} then : @@ -8462,17 +8667,14 @@ fi printf "%s\n" "$ac_cv_lib_avcore_avcore_version" >&6; } if test "x$ac_cv_lib_avcore_avcore_version" = xyes then : - ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVCORE=1" - ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavcore" - + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVCORE=1" + ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavcore" fi + fi - fi - - ac_fn_c_check_type "$LINENO" "enum AVPixelFormat" "ac_cv_type_enum_AVPixelFormat" "#include - + ac_fn_c_check_type "$LINENO" "enum AVPixelFormat" "ac_cv_type_enum_AVPixelFormat" "#include " if test "x$ac_cv_type_enum_AVPixelFormat" = xyes then : @@ -8481,12 +8683,13 @@ printf "%s\n" "#define HAVE_ENUM_AVPIXELFORMAT 1" >>confdefs.h else $as_nop - ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_USE_OLD_FFMPEG=1" + + 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 + LIBS="$LIBS $ac_ffmpeg_ldflags" + export PKG_CONFIG_PATH=$SAVED_PKG_CONFIG_PATH fi @@ -8496,16 +8699,16 @@ fi if test ${enable_v4l2+y} then : enableval=$enable_v4l2; - if test "$enable_v4l2" = "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if V4L2 is disabled... yes" >&5 + if test "$enable_v4l2" = "no"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if V4L2 is disabled... yes" >&5 printf "%s\n" "Checking if V4L2 is disabled... yes" >&6; } - fi + fi else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for v4l2_open in -lv4l2" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for v4l2_open in -lv4l2" >&5 printf %s "checking for v4l2_open in -lv4l2... " >&6; } if test ${ac_cv_lib_v4l2_v4l2_open+y} then : @@ -8542,14 +8745,14 @@ fi printf "%s\n" "$ac_cv_lib_v4l2_v4l2_open" >&6; } if test "x$ac_cv_lib_v4l2_v4l2_open" = xyes then : - ac_v4l2_cflags="-DPJMEDIA_VIDEO_DEV_HAS_V4L2=1" - ac_v4l2_ldflags="-lv4l2" - LIBS="$LIBS -lv4l2" - + ac_v4l2_cflags="-DPJMEDIA_VIDEO_DEV_HAS_V4L2=1" + ac_v4l2_ldflags="-lv4l2" + LIBS="$LIBS -lv4l2" fi + fi @@ -8574,66 +8777,69 @@ fi if test ${enable_openh264+y} then : enableval=$enable_openh264; - if test "$enable_openh264" = "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if OpenH264 is disabled... yes" >&5 + if test "$enable_openh264" = "no"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if OpenH264 is disabled... yes" >&5 printf "%s\n" "Checking if OpenH264 is disabled... yes" >&6; } - fi + fi else $as_nop - if test "x$with_openh264" != "xno" -a "x$with_openh264" != "x"; then - OPENH264_PREFIX=$with_openh264 - OPENH264_CFLAGS="-I$OPENH264_PREFIX/include" - OPENH264_LDFLAGS="-L$OPENH264_PREFIX/lib" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using OpenH264 prefix... $with_openh264" >&5 + if test "x$with_openh264" != "xno" -a "x$with_openh264" != "x"; then + OPENH264_PREFIX=$with_openh264 + OPENH264_CFLAGS="-I$OPENH264_PREFIX/include" + OPENH264_LDFLAGS="-L$OPENH264_PREFIX/lib" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using OpenH264 prefix... $with_openh264" >&5 printf "%s\n" "Using OpenH264 prefix... $with_openh264" >&6; } - else - OPENH264_CFLAGS="" - OPENH264_LDFLAGS="" - fi + else + OPENH264_CFLAGS="" + OPENH264_LDFLAGS="" + fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking OpenH264 usability" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking OpenH264 usability" >&5 printf %s "checking OpenH264 usability... " >&6; } - OPENH264_LIBS="-lopenh264 -lstdc++" + OPENH264_LIBS="-lopenh264 -lstdc++" - SAVED_LIBS="$LIBS" - SAVED_LDFLAGS="$LDFLAGS" - SAVED_CFLAGS="$CFLAGS" + SAVED_LIBS="$LIBS" + SAVED_LDFLAGS="$LDFLAGS" + SAVED_CFLAGS="$CFLAGS" - LIBS="$OPENH264_LIBS $LIBS" - LDFLAGS="$OPENH264_LDFLAGS $LDFLAGS" - CFLAGS="$OPENH264_CFLAGS $CFLAGS" + LIBS="$OPENH264_LIBS $LIBS" + LDFLAGS="$OPENH264_LDFLAGS $LDFLAGS" + CFLAGS="$OPENH264_CFLAGS $CFLAGS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - #include + + #include + #include int main (void) { WelsCreateSVCEncoder(0); - ; return 0; } + _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_openh264_cflags="-DPJMEDIA_HAS_OPENH264_CODEC=1 $OPENH264_CFLAGS" - ac_openh264_ldflags="$OPENH264_LDFLAGS $OPENH264_LIBS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + ac_openh264_cflags="-DPJMEDIA_HAS_OPENH264_CODEC=1 $OPENH264_CFLAGS" + ac_openh264_ldflags="$OPENH264_LDFLAGS $OPENH264_LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } else $as_nop - LIBS="$SAVED_LIBS" - LDFLAGS="$SAVED_LDFLAGS" - CFLAGS="$SAVED_CFLAGS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + LIBS="$SAVED_LIBS" + LDFLAGS="$SAVED_LDFLAGS" + CFLAGS="$SAVED_CFLAGS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -8663,66 +8869,69 @@ fi if test ${enable_vpx+y} then : enableval=$enable_vpx; - if test "$enable_vpx" = "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if VPX is disabled... yes" >&5 + if test "$enable_vpx" = "no"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if VPX is disabled... yes" >&5 printf "%s\n" "Checking if VPX is disabled... yes" >&6; } - fi + fi else $as_nop - if test "x$with_vpx" != "xno" -a "x$with_vpx" != "x"; then - VPX_PREFIX=$with_vpx - VPX_CFLAGS="-I$VPX_PREFIX/include" - VPX_LDFLAGS="-L$VPX_PREFIX/lib" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using VPX prefix... $with_vpx" >&5 + if test "x$with_vpx" != "xno" -a "x$with_vpx" != "x"; then + VPX_PREFIX=$with_vpx + VPX_CFLAGS="-I$VPX_PREFIX/include" + VPX_LDFLAGS="-L$VPX_PREFIX/lib" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using VPX prefix... $with_vpx" >&5 printf "%s\n" "Using VPX prefix... $with_vpx" >&6; } - else - VPX_CFLAGS="" - VPX_LDFLAGS="" - fi + else + VPX_CFLAGS="" + VPX_LDFLAGS="" + fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking VPX usability" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking VPX usability" >&5 printf %s "checking VPX usability... " >&6; } - VPX_LIBS="-lvpx" + VPX_LIBS="-lvpx" - SAVED_LIBS="$LIBS" - SAVED_LDFLAGS="$LDFLAGS" - SAVED_CFLAGS="$CFLAGS" + SAVED_LIBS="$LIBS" + SAVED_LDFLAGS="$LDFLAGS" + SAVED_CFLAGS="$CFLAGS" - LIBS="$VPX_LIBS $LIBS" - LDFLAGS="$VPX_LDFLAGS $LDFLAGS" - CFLAGS="$VPX_CFLAGS $CFLAGS" + LIBS="$VPX_LIBS $LIBS" + LDFLAGS="$VPX_LDFLAGS $LDFLAGS" + CFLAGS="$VPX_CFLAGS $CFLAGS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - #include + + #include + #include int main (void) { vpx_codec_iface_t *(*enc_if)() = &vpx_codec_vp8_cx; - ; return 0; } + _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_vpx_cflags="-DPJMEDIA_HAS_VPX_CODEC=1 $VPX_CFLAGS" - ac_vpx_ldflags="$VPX_LDFLAGS $VPX_LIBS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + ac_vpx_cflags="-DPJMEDIA_HAS_VPX_CODEC=1 $VPX_CFLAGS" + ac_vpx_ldflags="$VPX_LDFLAGS $VPX_LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } else $as_nop - LIBS="$SAVED_LIBS" - LDFLAGS="$SAVED_LDFLAGS" - CFLAGS="$SAVED_CFLAGS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + LIBS="$SAVED_LIBS" + LDFLAGS="$SAVED_LDFLAGS" + CFLAGS="$SAVED_CFLAGS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -8731,7 +8940,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ fi - # Check whether --enable-ipp was given. if test ${enable_ipp+y} then : @@ -8780,96 +8988,95 @@ if test "x$enable_ipp" != "xno"; then printf %s "checking Intel IPP location... " >&6; } if test "x$with_ipp" != "xno" -a "x$with_ipp" != "x"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ipp" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ipp" >&5 printf "%s\n" "$with_ipp" >&6; } - IPPROOT=$with_ipp + IPPROOT=$with_ipp elif test "x$IPPROOT" = "x"; then - if test -d /opt/intel/ipp; then - IPPROOT=`ls -d /opt/intel/ipp/*/* | head -1` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: autodetected in $IPPROOT" >&5 + if test -d /opt/intel/ipp; then + IPPROOT=`ls -d /opt/intel/ipp/*/* | head -1` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: autodetected in $IPPROOT" >&5 printf "%s\n" "autodetected in $IPPROOT" >&6; } - fi + fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $IPPROOT" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $IPPROOT" >&5 printf "%s\n" "$IPPROOT" >&6; } fi if test "x$with_ipp_arch" != "xno"; then - IPP_SUFFIX=$with_ipp_arch - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: IPP arch suffix is set to $IPP_SUFFIX" >&5 + IPP_SUFFIX=$with_ipp_arch + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: IPP arch suffix is set to $IPP_SUFFIX" >&5 printf "%s\n" "IPP arch suffix is set to $IPP_SUFFIX" >&6; } else - IPP_SUFFIX="" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: IPP arch suffix is set to empty" >&5 + IPP_SUFFIX="" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: IPP arch suffix is set to empty" >&5 printf "%s\n" "IPP arch suffix is set to empty" >&6; } fi if test x$IPPROOT = x; then - as_fn_error $? "the location is neither specified nor can be guessed. Please specify with IPPROOT env var or with --with-ipp option" "$LINENO" 5 + as_fn_error $? "the location is neither specified nor can be guessed. Please specify with IPPROOT env var or with --with-ipp option" "$LINENO" 5 elif test ! -d $IPPROOT; then - as_fn_error $? "not found" "$LINENO" 5 + as_fn_error $? "not found" "$LINENO" 5 elif test ! -d $IPPROOT/include; then - as_fn_error $? "directory doesn't seem to be valid" "$LINENO" 5 + as_fn_error $? "directory doesn't seem to be valid" "$LINENO" 5 else - # IPP directory looks okay. - # Remove trailing backslash - IPPROOT=`echo $IPPROOT | sed 's/\/$//'` - - SAVED_CFLAGS="$CFLAGS" - SAVED_LDFLAGS="$LDFLAGS" - SAVED_LIBS="$LIBS" - - IPP_CFLAGS="-I$IPPROOT/include" - IPP_LIBS="-lippsc${IPP_SUFFIX} -lipps${IPP_SUFFIX} -lippcore${IPP_SUFFIX}" - -# - # Some differences between Mac OS X and Linux - case $target in - *darwin* ) - IPP_LDFLAGS="-L$IPPROOT/Libraries -L$IPPROOT/lib" - ;; - *) - # Find out where the libraries live. - IPP7_ARCH="" - if test -d $IPPROOT/lib/intel64; then - IPP7_ARCH="intel64" - elif test -d $IPPROOT/lib/ia32; then - IPP7_ARCH="ia32" - elif test -d $IPPROOT/lib/mic; then - IPP7_ARCH="mic" - fi - - if test -z "$IPP7_ARCH"; then - # IPP6 (and possibly below) - IPP_LDFLAGS="-L$IPPROOT/sharedlib" - IPP_LIBS="$IPP_LIBS -lippsr${IPP_SUFFIX} -lguide" - else - # IPP7 - if ! test -d $IPPROOT/../compiler; then - as_fn_error $? "Cannot find $IPPROOT/../compiler directory. Please set IPPROOT variable correctly" "$LINENO" 5 - fi - IPP_CFLAGS="$IPP_CFLAGS" - IPP_LDFLAGS="-L$IPPROOT/lib/intel64 -L$IPPROOT/../compiler/lib/$IPP7_ARCH" - IPP_LIBS="$IPP_LIBS -liomp5" - fi - ;; - esac + # IPP directory looks okay. + # Remove trailing backslash + IPPROOT=`echo $IPPROOT | sed 's/\/$//'` + + SAVED_CFLAGS="$CFLAGS" + SAVED_LDFLAGS="$LDFLAGS" + SAVED_LIBS="$LIBS" + + IPP_CFLAGS="-I$IPPROOT/include" + IPP_LIBS="-lippsc${IPP_SUFFIX} -lipps${IPP_SUFFIX} -lippcore${IPP_SUFFIX}" + + # Some differences between Mac OS X and Linux + case $target in + *darwin* ) + IPP_LDFLAGS="-L$IPPROOT/Libraries -L$IPPROOT/lib" + ;; + *) + # Find out where the libraries live. + IPP7_ARCH="" + if test -d $IPPROOT/lib/intel64; then + IPP7_ARCH="intel64" + elif test -d $IPPROOT/lib/ia32; then + IPP7_ARCH="ia32" + elif test -d $IPPROOT/lib/mic; then + IPP7_ARCH="mic" + fi - #IPP_LDFLAGS="-L$IPPROOT/sharedlib" - #Static: - #IPP_LIBS="-lippscmerged -lippsrmerged -lippsmerged -lippcore" + if test -z "$IPP7_ARCH"; then + # IPP6 (and possibly below) + IPP_LDFLAGS="-L$IPPROOT/sharedlib" + IPP_LIBS="$IPP_LIBS -lippsr${IPP_SUFFIX} -lguide" + else + # IPP7 + if ! test -d $IPPROOT/../compiler; then + as_fn_error $? "Cannot find $IPPROOT/../compiler directory. Please set IPPROOT variable correctly" "$LINENO" 5 + fi + IPP_CFLAGS="$IPP_CFLAGS" + IPP_LDFLAGS="-L$IPPROOT/lib/intel64 -L$IPPROOT/../compiler/lib/$IPP7_ARCH" + IPP_LIBS="$IPP_LIBS -liomp5" + fi + ;; + esac - CFLAGS="$CFLAGS $IPP_CFLAGS" - LDFLAGS="$LDFLAGS $IPP_LDFLAGS" - LIBS="$IPP_LIBS $LIBS" + #IPP_LDFLAGS="-L$IPPROOT/sharedlib" + #Static: + #IPP_LIBS="-lippscmerged -lippsrmerged -lippsmerged -lippcore" + CFLAGS="$CFLAGS $IPP_CFLAGS" + LDFLAGS="$LDFLAGS $IPP_LDFLAGS" + LIBS="$IPP_LIBS $LIBS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Intel IPP usability" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Intel IPP usability" >&5 printf %s "checking Intel IPP usability... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + + #include int main (void) { @@ -8877,6 +9084,7 @@ ippStaticInit(); ; return 0; } + _ACEOF if ac_fn_c_try_link "$LINENO" then : @@ -8887,117 +9095,119 @@ else $as_nop printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_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 See \`config.log' for more details" "$LINENO" 5; } + fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - CFLAGS="$SAVED_CFLAGS" - LDFLAGS="$SAVED_LDFLAGS" - LIBS="$SAVED_LIBS" + CFLAGS="$SAVED_CFLAGS" + LDFLAGS="$SAVED_LDFLAGS" + LIBS="$SAVED_LIBS" fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Intel IPP samples location" >&5 printf %s "checking Intel IPP samples location... " >&6; } if test "x$with_ipp_samples" != "xno" -a "x$with_ipp_samples" != "x"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ipp_samples" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ipp_samples" >&5 printf "%s\n" "$with_ipp_samples" >&6; } - IPPSAMPLES=$with_ipp_samples + IPPSAMPLES=$with_ipp_samples elif test "x$IPPSAMPLES" = "x"; then - if test -d /opt/intel/ipp-samples; then - IPPSAMPLES=/opt/intel/ipp-samples - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: autodetected in $IPPSAMPLES" >&5 + if test -d /opt/intel/ipp-samples; then + IPPSAMPLES=/opt/intel/ipp-samples + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: autodetected in $IPPSAMPLES" >&5 printf "%s\n" "autodetected in $IPPSAMPLES" >&6; } - fi + fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $IPPSAMPLES" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $IPPSAMPLES" >&5 printf "%s\n" "$IPPSAMPLES" >&6; } fi if test x$IPPSAMPLES = x; then - as_fn_error $? "the location is neither specified nor can be guessed. Please specify with IPPSAMPLES env var or with --with-ipp-samples option" "$LINENO" 5 + as_fn_error $? "the location is neither specified nor can be guessed. Please specify with IPPSAMPLES env var or with --with-ipp-samples option" "$LINENO" 5 elif test ! -d $IPPSAMPLES; then - as_fn_error $? "not found" "$LINENO" 5 + as_fn_error $? "not found" "$LINENO" 5 elif test ! -d $IPPSAMPLES/speech-codecs; then - as_fn_error $? "directory doesn't seem to be valid" "$LINENO" 5 + as_fn_error $? "directory doesn't seem to be valid" "$LINENO" 5 else - # Remove trailing backslash - IPPSAMPLES=`echo $IPPSAMPLES | sed 's/\/$//'` + # Remove trailing backslash + IPPSAMPLES=`echo $IPPSAMPLES | sed 's/\/$//'` - # Guess the libusc.a/libspeech.a build location - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Intel IPP USC build location" >&5 + # Guess the libusc.a/libspeech.a build location + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Intel IPP USC build location" >&5 printf %s "checking Intel IPP USC build location... " >&6; } - if test -d $IPPSAMPLES/speech-codecs/bin; then - IPPVER=5 - IPPSAMP_DIR=`ls -d $IPPSAMPLES/speech-codecs/bin/*gcc*/lib | head -1` - elif test -d $IPPSAMPLES/speech-codecs/_bin; then - IPPVER=6 - if test -d $IPPSAMPLES/speech-codecs/_bin/*gcc*; then - # gcc compiler - IPPSAMP_DIR=`ls -d $IPPSAMPLES/speech-codecs/_bin/*gcc*/lib | head -1` - elif test -d $IPPSAMPLES/speech-codecs/_bin/*icc*; then - # icc compiler - IPPSAMP_DIR=`ls -d $IPPSAMPLES/speech-codecs/_bin/*icc*/lib | head -1` - else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + if test -d $IPPSAMPLES/speech-codecs/bin; then + IPPVER=5 + IPPSAMP_DIR=`ls -d $IPPSAMPLES/speech-codecs/bin/*gcc*/lib | head -1` + elif test -d $IPPSAMPLES/speech-codecs/_bin; then + IPPVER=6 + if test -d $IPPSAMPLES/speech-codecs/_bin/*gcc*; then + # gcc compiler + IPPSAMP_DIR=`ls -d $IPPSAMPLES/speech-codecs/_bin/*gcc*/lib | head -1` + elif test -d $IPPSAMPLES/speech-codecs/_bin/*icc*; then + # icc compiler + IPPSAMP_DIR=`ls -d $IPPSAMPLES/speech-codecs/_bin/*icc*/lib | head -1` + else + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Unable to find to find built binaries under $IPPSAMPLES/speech-codecs/{bin,_bin}. Have you built the IPP samples? See \`config.log' for more details" "$LINENO" 5; } - fi - else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + fi + else + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "unable to find $IPPSAMPLES/speech-codecs/bin/*gcc*/lib or $IPPSAMPLES/speech-codecs/_bin/*gcc*/lib directory. Have you built the samples? See \`config.log' for more details" "$LINENO" 5; } - fi + fi - # Test the directory - if test ! -d $IPPSAMP_DIR; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + # Test the directory + if test ! -d $IPPSAMP_DIR; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "There's something wrong with this script, directory $IPPSAMP_DIR does not exist See \`config.log' for more details" "$LINENO" 5; } - exit 1; - fi + exit 1; + fi - if test "x$IPPVER" = "x5"; then - IPPSAMP_LIBS="libusc.a" - IPPSAMP_LDLIBS="-lusc" - elif test "x$IPPVER" = "x6"; then - IPPSAMP_LIBS="libspeech.a" - IPPSAMP_LDLIBS="-lspeech" - else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + if test "x$IPPVER" = "x5"; then + IPPSAMP_LIBS="libusc.a" + IPPSAMP_LDLIBS="-lusc" + elif test "x$IPPVER" = "x6"; then + IPPSAMP_LIBS="libspeech.a" + IPPSAMP_LDLIBS="-lspeech" + else + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "bug in this script: unsupported IPP version See \`config.log' for more details" "$LINENO" 5; } - fi + fi - if test ! -f $IPPSAMP_DIR/$IPPSAMP_LIBS; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + if test ! -f $IPPSAMP_DIR/$IPPSAMP_LIBS; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "$IPPSAMP_LIBS doesn't exist in $IPPSAMP_DIR See \`config.log' for more details" "$LINENO" 5; } - fi + fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $IPPSAMP_DIR" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $IPPSAMP_DIR" >&5 printf "%s\n" "$IPPSAMP_DIR" >&6; } - SAVED_CFLAGS="$CFLAGS" - SAVED_LDFLAGS="$LDFLAGS" - SAVED_LIBS="$LIBS" + SAVED_CFLAGS="$CFLAGS" + SAVED_LDFLAGS="$LDFLAGS" + SAVED_LIBS="$LIBS" - IPPSAMP_INC="-I$IPPSAMPLES/speech-codecs/core/usc/include" - CFLAGS="$CFLAGS $IPPSAMP_INC" - LDFLAGS="$LDFLAGS -L$IPPSAMP_DIR" - LIBS="$IPPSAMP_LDLIBS $LIBS" + IPPSAMP_INC="-I$IPPSAMPLES/speech-codecs/core/usc/include" + CFLAGS="$CFLAGS $IPPSAMP_INC" + LDFLAGS="$LDFLAGS -L$IPPSAMP_DIR" + LIBS="$IPPSAMP_LDLIBS $LIBS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Intel IPP USC usability" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Intel IPP USC usability" >&5 printf %s "checking Intel IPP USC usability... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + + #include int main (void) { @@ -9005,6 +9215,7 @@ extern USC_Fxns USC_G729AFP_Fxns; ; return 0; } + _ACEOF if ac_fn_c_try_link "$LINENO" then : @@ -9015,17 +9226,18 @@ else $as_nop printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no See \`config.log' for more details" "$LINENO" 5; } + fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - CFLAGS="$SAVED_CFLAGS" - LDFLAGS="$IPP_LDFLAGS $SAVED_LDFLAGS" - LIBS="$IPP_LIBS $SAVED_LIBS" + CFLAGS="$SAVED_CFLAGS" + LDFLAGS="$IPP_LDFLAGS $SAVED_LDFLAGS" + LIBS="$IPP_LIBS $SAVED_LIBS" - IPP_CFLAGS="$IPP_CFLAGS $IPPSAMP_INC" - IPP_LDFLAGS="$IPP_LDFLAGS -L$IPPSAMP_DIR" - IPP_LIBS="$IPPSAMP_LDLIBS $IPP_LIBS" + IPP_CFLAGS="$IPP_CFLAGS $IPPSAMP_INC" + IPP_LDFLAGS="$IPP_LDFLAGS -L$IPPSAMP_DIR" + IPP_LIBS="$IPPSAMP_LDLIBS $IPP_LIBS" fi CFLAGS="$CFLAGS $IPP_CFLAGS" @@ -9033,9 +9245,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ LIBS="$LIBS $IPP_LIBS" ac_build_mak_vars="$ac_build_mak_vars\n\ -export IPP_CFLAGS=$IPP_CFLAGS\n\ -export IPP_LDFLAGS=$IPP_LDFLAGS\n\ -export IPP_LIBS=$IPP_LIBS" + export IPP_CFLAGS=$IPP_CFLAGS\n\ + export IPP_LDFLAGS=$IPP_LDFLAGS\n\ + export IPP_LIBS=$IPP_LIBS" else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Skipping Intel IPP settings (not wanted)" >&5 printf "%s\n" "Skipping Intel IPP settings (not wanted)" >&6; } @@ -9046,16 +9258,18 @@ fi # Check whether --enable-android-mediacodec was given. if test ${enable_android_mediacodec+y} then : - enableval=$enable_android_mediacodec; if test "$enable_android_mediacodec" = "no"; then - ac_no_mediacodec=1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Android MediaCodec support is disabled... yes" >&5 + enableval=$enable_android_mediacodec; + if test "$enable_android_mediacodec" = "no"; then + ac_no_mediacodec=1 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Android MediaCodec support is disabled... yes" >&5 printf "%s\n" "Checking if Android MediaCodec support is disabled... yes" >&6; } - fi + fi + else $as_nop - case $target in - *android*) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for AMediaCodec_createDecoderByType in -lmediandk" >&5 + case $target in + *android*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for AMediaCodec_createDecoderByType in -lmediandk" >&5 printf %s "checking for AMediaCodec_createDecoderByType in -lmediandk... " >&6; } if test ${ac_cv_lib_mediandk_AMediaCodec_createDecoderByType+y} then : @@ -9092,20 +9306,23 @@ fi printf "%s\n" "$ac_cv_lib_mediandk_AMediaCodec_createDecoderByType" >&6; } if test "x$ac_cv_lib_mediandk_AMediaCodec_createDecoderByType" = xyes then : - ac_pjmedia_has_amediacodec=1 && LIBS="-lmediandk $LIBS" + + ac_pjmedia_has_amediacodec=1 && LIBS="-lmediandk $LIBS" fi - if test "x$ac_pjmedia_has_amediacodec" = "x1"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Android AMediaCodec library is available... yes" >&5 + + if test "x$ac_pjmedia_has_amediacodec" = "x1"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Android AMediaCodec library is available... yes" >&5 printf "%s\n" "Checking if Android AMediaCodec library is available... yes" >&6; } - printf "%s\n" "#define PJMEDIA_HAS_ANDROID_MEDIACODEC 1" >>confdefs.h + printf "%s\n" "#define PJMEDIA_HAS_ANDROID_MEDIACODEC 1" >>confdefs.h - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Android AMediaCodec library is available... no" >&5 + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Android AMediaCodec library is available... no" >&5 printf "%s\n" "Checking if Android AMediaCodec library is available... no" >&6; } - fi - ;; - esac + fi + ;; + esac + fi @@ -9145,53 +9362,61 @@ ac_ssl_has_aes_gcm=0 # Check whether --enable-darwin-ssl was given. if test ${enable_darwin_ssl+y} then : - enableval=$enable_darwin_ssl; if test "$enable_darwin_ssl" = "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Darwin SSL support is disabled... yes" >&5 + enableval=$enable_darwin_ssl; + if test "$enable_darwin_ssl" = "no"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Darwin SSL support is disabled... yes" >&5 printf "%s\n" "Checking if Darwin SSL support is disabled... yes" >&6; } - fi + fi + else $as_nop - case $target in - *darwin*) - SAVED_CFLAGS="$CFLAGS" - CFLAGS="-Werror" - SAVED_LIBS="$LIBS" - LIBS="-framework Security" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + case $target in + *darwin*) + SAVED_CFLAGS="$CFLAGS" + CFLAGS="-Werror" + SAVED_LIBS="$LIBS" + + LIBS="-framework Security" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + + + #include int main (void) { if (__builtin_available(macOS 10.12, iOS 10.0, *)) { - SSLContextRef ssl_ctx; - SSLReHandshake(ssl_ctx); - } + SSLContextRef ssl_ctx; + SSLReHandshake(ssl_ctx); + } ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_ssl_backend=darwin fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - CFLAGS="$SAVED_CFLAGS" - LIBS="$SAVED_LIBS" - if test "x$ac_ssl_backend" = "xdarwin"; then - printf "%s\n" "#define PJ_HAS_SSL_SOCK 1" >>confdefs.h - printf "%s\n" "#define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_DARWIN" >>confdefs.h + CFLAGS="$SAVED_CFLAGS" + LIBS="$SAVED_LIBS" + if test "x$ac_ssl_backend" = "xdarwin"; then + printf "%s\n" "#define PJ_HAS_SSL_SOCK 1" >>confdefs.h + + printf "%s\n" "#define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_DARWIN" >>confdefs.h - LIBS="$LIBS -framework Security" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Darwin SSL is available... yes" >&5 + LIBS="$LIBS -framework Security" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Darwin SSL is available... yes" >&5 printf "%s\n" "Checking if Darwin SSL is available... yes" >&6; } - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Darwin SSL is available... no" >&5 + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Darwin SSL is available... no" >&5 printf "%s\n" "Checking if Darwin SSL is available... no" >&6; } - fi - ;; - esac + fi + ;; + esac + fi @@ -9200,37 +9425,38 @@ fi if test ${enable_ssl+y} then : enableval=$enable_ssl; - if test "$enable_ssl" = "no"; then - ac_no_ssl=1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if SSL support is disabled... yes" >&5 + if test "$enable_ssl" = "no"; then + ac_no_ssl=1 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if SSL support is disabled... yes" >&5 printf "%s\n" "Checking if SSL support is disabled... yes" >&6; } - fi + fi else $as_nop - if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then - CFLAGS="$CFLAGS -I$with_ssl/include" - CPPFLAGS="$CPPFLAGS -I$with_ssl/include" - LDFLAGS="$LDFLAGS -L$with_ssl/lib" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using SSL prefix... $with_ssl" >&5 + if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then + CFLAGS="$CFLAGS -I$with_ssl/include" + CPPFLAGS="$CPPFLAGS -I$with_ssl/include" + LDFLAGS="$LDFLAGS -L$with_ssl/lib" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using SSL prefix... $with_ssl" >&5 printf "%s\n" "Using SSL prefix... $with_ssl" >&6; } - fi + fi - if test "x$with_gnutls" = "xno"; then - # We still need to check for OpenSSL installations even if - # we find Darwin SSL above since DTLS requires OpenSSL. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for OpenSSL installations.." >&5 + if test "x$with_gnutls" = "xno"; then + # We still need to check for OpenSSL installations even if + # we find Darwin SSL above since DTLS requires OpenSSL. + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for OpenSSL installations.." >&5 printf "%s\n" "checking for OpenSSL installations.." >&6; } - ac_fn_c_check_header_compile "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default" if test "x$ac_cv_header_openssl_ssl_h" = xyes then : openssl_h_present=1 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ERR_load_BIO_strings in -lcrypto" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ERR_load_BIO_strings in -lcrypto" >&5 printf %s "checking for ERR_load_BIO_strings in -lcrypto... " >&6; } if test ${ac_cv_lib_crypto_ERR_load_BIO_strings+y} then : @@ -9267,9 +9493,11 @@ fi printf "%s\n" "$ac_cv_lib_crypto_ERR_load_BIO_strings" >&6; } if test "x$ac_cv_lib_crypto_ERR_load_BIO_strings" = xyes then : - libcrypto_present=1 && LIBS="-lcrypto $LIBS" + + libcrypto_present=1 && LIBS="-lcrypto $LIBS" else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ERR_get_error in -lcrypto" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ERR_get_error in -lcrypto" >&5 printf %s "checking for ERR_get_error in -lcrypto... " >&6; } if test ${ac_cv_lib_crypto_ERR_get_error+y} then : @@ -9309,9 +9537,12 @@ then : libcrypto_present=1 && LIBS="-lcrypto $LIBS" fi + + fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_new in -lssl" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_new in -lssl" >&5 printf %s "checking for SSL_CTX_new in -lssl... " >&6; } if test ${ac_cv_lib_ssl_SSL_CTX_new+y} then : @@ -9351,19 +9582,22 @@ then : libssl_present=1 && LIBS="-lssl $LIBS" fi - if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OpenSSL library found, SSL support enabled" >&5 + + if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OpenSSL library found, SSL support enabled" >&5 printf "%s\n" "OpenSSL library found, SSL support enabled" >&6; } - # Check if SRTP should be compiled with OpenSSL - # support, to enable cryptos such as AES GCM. + # Check if SRTP should be compiled with OpenSSL + # support, to enable cryptos such as AES GCM. - # EVP_CIPHER_CTX is now opaque in OpenSSL 1.1.0, libsrtp 1.5.4 uses it as a transparent type. - # Update 2.7: our bundled libsrtp has been upgraded to 2.1.0, - # so we can omit EVP_CIPHER_CTX definition check now. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # EVP_CIPHER_CTX is now opaque in OpenSSL 1.1.0, libsrtp 1.5.4 uses it as a transparent type. + # Update 2.7: our bundled libsrtp has been upgraded to 2.1.0, + # so we can omit EVP_CIPHER_CTX definition check now. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + + + #include int main (void) { @@ -9371,10 +9605,12 @@ EVP_CIPHER_CTX *ctx;EVP_aes_128_gcm(); ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EVP_aes_128_gcm in -lcrypto" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EVP_aes_128_gcm in -lcrypto" >&5 printf %s "checking for EVP_aes_128_gcm in -lcrypto... " >&6; } if test ${ac_cv_lib_crypto_EVP_aes_128_gcm+y} then : @@ -9414,106 +9650,59 @@ then : ac_ssl_has_aes_gcm=1 fi + + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - if test "x$ac_ssl_has_aes_gcm" = "x1"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OpenSSL has AES GCM support, SRTP will use OpenSSL" >&5 + + if test "x$ac_ssl_has_aes_gcm" = "x1"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OpenSSL has AES GCM support, SRTP will use OpenSSL" >&5 printf "%s\n" "OpenSSL has AES GCM support, SRTP will use OpenSSL" >&6; } - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OpenSSL AES GCM support not found, SRTP will only support AES CM cryptos" >&5 + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OpenSSL AES GCM support not found, SRTP will only support AES CM cryptos" >&5 printf "%s\n" "OpenSSL AES GCM support not found, SRTP will only support AES CM cryptos" >&6; } - fi + fi - if test "x$ac_ssl_backend" = "x"; then - # PJSIP_HAS_TLS_TRANSPORT setting follows PJ_HAS_SSL_SOCK - #AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1) - printf "%s\n" "#define PJ_HAS_SSL_SOCK 1" >>confdefs.h + if test "x$ac_ssl_backend" = "x"; then + # PJSIP_HAS_TLS_TRANSPORT setting follows PJ_HAS_SSL_SOCK + #AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1) + printf "%s\n" "#define PJ_HAS_SSL_SOCK 1" >>confdefs.h - printf "%s\n" "#define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_OPENSSL" >>confdefs.h + printf "%s\n" "#define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_OPENSSL" >>confdefs.h - ac_ssl_backend="openssl" - fi - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ** OpenSSL libraries not found **" >&5 + ac_ssl_backend="openssl" + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ** OpenSSL libraries not found **" >&5 printf "%s\n" "** OpenSSL libraries not found **" >&6; } - fi - - fi - - if test "x$ac_ssl_backend" = "x"; then + fi + fi - if test "x$with_gnutls" != "xno" -a "x$with_gnutls" != "x"; then - CFLAGS="$CFLAGS -I$with_gnutls/include" - LDFLAGS="$LDFLAGS -L$with_gnutls/lib" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using GnuTLS prefix... $with_gnutls" >&5 + if test "x$ac_ssl_backend" = "x"; then + if test "x$with_gnutls" != "xno" -a "x$with_gnutls" != "x"; then + CFLAGS="$CFLAGS -I$with_gnutls/include" + LDFLAGS="$LDFLAGS -L$with_gnutls/lib" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using GnuTLS prefix... $with_gnutls" >&5 printf "%s\n" "Using GnuTLS prefix... $with_gnutls" >&6; } - fi + fi - for ac_prog in $host-pkg-config pkg-config "python pkgconfig.py" -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_PKG_CONFIG+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$PKG_CONFIG"; then - ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_PKG_CONFIG="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -PKG_CONFIG=$ac_cv_prog_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -printf "%s\n" "$PKG_CONFIG" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - test -n "$PKG_CONFIG" && break -done -test -n "$PKG_CONFIG" || PKG_CONFIG="none" - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for GnuTLS installations.." >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for GnuTLS installations.." >&5 printf "%s\n" "checking for GnuTLS installations.." >&6; } - ac_fn_c_check_header_compile "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default" if test "x$ac_cv_header_gnutls_gnutls_h" = xyes then : gnutls_h_present=1 fi - if test "$PKG_CONFIG" != "none"; then - if $PKG_CONFIG --exists gnutls; then - LIBS="$LIBS `$PKG_CONFIG --libs gnutls`" - libgnutls_present=1 - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gnutls_certificate_set_x509_system_trust in -lgnutls" >&5 + if test "$PKG_CONFIG" != "none"; then + if $PKG_CONFIG --exists gnutls; then + LIBS="$LIBS `$PKG_CONFIG --libs gnutls`" + libgnutls_present=1 + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gnutls_certificate_set_x509_system_trust in -lgnutls" >&5 printf %s "checking for gnutls_certificate_set_x509_system_trust in -lgnutls... " >&6; } if test ${ac_cv_lib_gnutls_gnutls_certificate_set_x509_system_trust+y} then : @@ -9550,30 +9739,31 @@ fi printf "%s\n" "$ac_cv_lib_gnutls_gnutls_certificate_set_x509_system_trust" >&6; } if test "x$ac_cv_lib_gnutls_gnutls_certificate_set_x509_system_trust" = xyes then : - libgnutls_present=1 && - LIBS="$LIBS -lgnutls" + + libgnutls_present=1 && LIBS="$LIBS -lgnutls" fi - fi - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: *** Warning: neither pkg-config nor python is available, disabling gnutls. ***" >&5 + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: *** Warning: neither pkg-config nor python is available, disabling gnutls. ***" >&5 printf "%s\n" "*** Warning: neither pkg-config nor python is available, disabling gnutls. ***" >&6; } - fi + fi - if test "x$gnutls_h_present" = "x1" -a "x$libgnutls_present" = "x1"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: GnuTLS library found, SSL support enabled" >&5 + if test "x$gnutls_h_present" = "x1" -a "x$libgnutls_present" = "x1"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: GnuTLS library found, SSL support enabled" >&5 printf "%s\n" "GnuTLS library found, SSL support enabled" >&6; } - printf "%s\n" "#define PJ_HAS_SSL_SOCK 1" >>confdefs.h + printf "%s\n" "#define PJ_HAS_SSL_SOCK 1" >>confdefs.h - printf "%s\n" "#define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_GNUTLS" >>confdefs.h + printf "%s\n" "#define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_GNUTLS" >>confdefs.h - ac_ssl_backend="gnutls" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ** No GnuTLS libraries found, disabling SSL support **" >&5 + ac_ssl_backend="gnutls" + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ** No GnuTLS libraries found, disabling SSL support **" >&5 printf "%s\n" "** No GnuTLS libraries found, disabling SSL support **" >&6; } - fi + fi + + fi - fi fi @@ -9626,44 +9816,46 @@ fi if test ${enable_opencore_amr+y} then : enableval=$enable_opencore_amr; - if test "$enable_opencore_amr" = "no"; then - ac_no_opencore_amrnb=1 - ac_no_opencore_amrwb=1 - printf "%s\n" "#define PJMEDIA_HAS_OPENCORE_AMRNB_CODEC 0" >>confdefs.h + if test "$enable_opencore_amr" = "no"; then + ac_no_opencore_amrnb=1 + ac_no_opencore_amrwb=1 + printf "%s\n" "#define PJMEDIA_HAS_OPENCORE_AMRNB_CODEC 0" >>confdefs.h - printf "%s\n" "#define PJMEDIA_HAS_OPENCORE_AMRWB_CODEC 0" >>confdefs.h + printf "%s\n" "#define PJMEDIA_HAS_OPENCORE_AMRWB_CODEC 0" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if OpenCORE AMR support is disabled... yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if OpenCORE AMR support is disabled... yes" >&5 printf "%s\n" "Checking if OpenCORE AMR support is disabled... yes" >&6; } - fi + fi else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for OpenCORE AMR installations.." >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for OpenCORE AMR installations.." >&5 printf "%s\n" "checking for OpenCORE AMR installations.." >&6; } - if test "x$with_opencore_amr" != "xno" -a "x$with_opencore_amr" != "x"; then - CFLAGS="$CFLAGS -I$with_opencore_amr/include" - CPPFLAGS="$CPPFLAGS -I$with_opencore_amr/include" - LDFLAGS="$LDFLAGS -L$with_opencore_amr/lib" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using OpenCORE AMR prefix... $with_opencore_amr" >&5 + if test "x$with_opencore_amr" != "xno" -a "x$with_opencore_amr" != "x"; then + CFLAGS="$CFLAGS -I$with_opencore_amr/include" + CPPFLAGS="$CPPFLAGS -I$with_opencore_amr/include" + LDFLAGS="$LDFLAGS -L$with_opencore_amr/lib" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using OpenCORE AMR prefix... $with_opencore_amr" >&5 printf "%s\n" "Using OpenCORE AMR prefix... $with_opencore_amr" >&6; } - fi - if test "x$with_opencore_amrwbenc" != "xno" -a "x$with_opencore_amrwbenc" != "x"; then - CFLAGS="$CFLAGS -I$with_opencore_amrwbenc/include" - CPPFLAGS="$CPPFLAGS -I$with_opencore_amrwbenc/include" - LDFLAGS="$LDFLAGS -L$with_opencore_amrwbenc/lib" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using OpenCORE AMRWB-enc prefix... $with_opencore_amrwbenc" >&5 + fi + + if test "x$with_opencore_amrwbenc" != "xno" -a "x$with_opencore_amrwbenc" != "x"; then + CFLAGS="$CFLAGS -I$with_opencore_amrwbenc/include" + CPPFLAGS="$CPPFLAGS -I$with_opencore_amrwbenc/include" + LDFLAGS="$LDFLAGS -L$with_opencore_amrwbenc/lib" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using OpenCORE AMRWB-enc prefix... $with_opencore_amrwbenc" >&5 printf "%s\n" "Using OpenCORE AMRWB-enc prefix... $with_opencore_amrwbenc" >&6; } - fi + fi + - ac_fn_c_check_header_compile "$LINENO" "opencore-amrnb/interf_enc.h" "ac_cv_header_opencore_amrnb_interf_enc_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "opencore-amrnb/interf_enc.h" "ac_cv_header_opencore_amrnb_interf_enc_h" "$ac_includes_default" if test "x$ac_cv_header_opencore_amrnb_interf_enc_h" = xyes then : opencore_amrnb_h_present=1 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Encoder_Interface_init in -lopencore-amrnb" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Encoder_Interface_init in -lopencore-amrnb" >&5 printf %s "checking for Encoder_Interface_init in -lopencore-amrnb... " >&6; } if test ${ac_cv_lib_opencore_amrnb_Encoder_Interface_init+y} then : @@ -9700,36 +9892,40 @@ fi printf "%s\n" "$ac_cv_lib_opencore_amrnb_Encoder_Interface_init" >&6; } if test "x$ac_cv_lib_opencore_amrnb_Encoder_Interface_init" = xyes then : - opencore_amrnb_present=1 && LIBS="$LIBS -lopencore-amrnb" + + opencore_amrnb_present=1 && LIBS="$LIBS -lopencore-amrnb" fi - if test "x$opencore_amrnb_h_present" = "x1" -a "x$opencore_amrnb_present" = "x1"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OpenCORE AMR-NB library found, AMR-NB support enabled" >&5 + + if test "x$opencore_amrnb_h_present" = "x1" -a "x$opencore_amrnb_present" = "x1"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OpenCORE AMR-NB library found, AMR-NB support enabled" >&5 printf "%s\n" "OpenCORE AMR-NB library found, AMR-NB support enabled" >&6; } - printf "%s\n" "#define PJMEDIA_HAS_OPENCORE_AMRNB_CODEC 1" >>confdefs.h + printf "%s\n" "#define PJMEDIA_HAS_OPENCORE_AMRNB_CODEC 1" >>confdefs.h - else - ac_no_opencore_amrnb=1 - printf "%s\n" "#define PJMEDIA_HAS_OPENCORE_AMRNB_CODEC 0" >>confdefs.h + else + ac_no_opencore_amrnb=1 + printf "%s\n" "#define PJMEDIA_HAS_OPENCORE_AMRNB_CODEC 0" >>confdefs.h + + fi - fi - ac_fn_c_check_header_compile "$LINENO" "vo-amrwbenc/enc_if.h" "ac_cv_header_vo_amrwbenc_enc_if_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "vo-amrwbenc/enc_if.h" "ac_cv_header_vo_amrwbenc_enc_if_h" "$ac_includes_default" if test "x$ac_cv_header_vo_amrwbenc_enc_if_h" = xyes then : opencore_amrwb_enc_h_present=1 fi - ac_fn_c_check_header_compile "$LINENO" "opencore-amrwb/dec_if.h" "ac_cv_header_opencore_amrwb_dec_if_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "opencore-amrwb/dec_if.h" "ac_cv_header_opencore_amrwb_dec_if_h" "$ac_includes_default" if test "x$ac_cv_header_opencore_amrwb_dec_if_h" = xyes then : opencore_amrwb_dec_h_present=1 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for D_IF_init in -lopencore-amrwb" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for D_IF_init in -lopencore-amrwb" >&5 printf %s "checking for D_IF_init in -lopencore-amrwb... " >&6; } if test ${ac_cv_lib_opencore_amrwb_D_IF_init+y} then : @@ -9766,10 +9962,12 @@ fi printf "%s\n" "$ac_cv_lib_opencore_amrwb_D_IF_init" >&6; } if test "x$ac_cv_lib_opencore_amrwb_D_IF_init" = xyes then : - opencore_amrwb_dec_present=1 && LIBS="$LIBS -lopencore-amrwb" + + opencore_amrwb_dec_present=1 && LIBS="$LIBS -lopencore-amrwb" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for E_IF_init in -lvo-amrwbenc" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for E_IF_init in -lvo-amrwbenc" >&5 printf %s "checking for E_IF_init in -lvo-amrwbenc... " >&6; } if test ${ac_cv_lib_vo_amrwbenc_E_IF_init+y} then : @@ -9806,19 +10004,21 @@ fi printf "%s\n" "$ac_cv_lib_vo_amrwbenc_E_IF_init" >&6; } if test "x$ac_cv_lib_vo_amrwbenc_E_IF_init" = xyes then : - opencore_amrwb_enc_present=1 && LIBS="$LIBS -lvo-amrwbenc" + + opencore_amrwb_enc_present=1 && LIBS="$LIBS -lvo-amrwbenc" fi - if test "x$opencore_amrwb_enc_h_present" = "x1" -a "x$opencore_amrwb_dec_h_present" = "x1" -a "x$opencore_amrwb_enc_present" = "x1" -a "x$opencore_amrwb_dec_present" = "x1"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OpenCORE AMR-WB library found, AMR-WB support enabled" >&5 + + if test "x$opencore_amrwb_enc_h_present" = "x1" -a "x$opencore_amrwb_dec_h_present" = "x1" -a "x$opencore_amrwb_enc_present" = "x1" -a "x$opencore_amrwb_dec_present" = "x1"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OpenCORE AMR-WB library found, AMR-WB support enabled" >&5 printf "%s\n" "OpenCORE AMR-WB library found, AMR-WB support enabled" >&6; } - printf "%s\n" "#define PJMEDIA_HAS_OPENCORE_AMRWB_CODEC 1" >>confdefs.h + printf "%s\n" "#define PJMEDIA_HAS_OPENCORE_AMRWB_CODEC 1" >>confdefs.h - else - ac_no_opencore_amrwb=1 - printf "%s\n" "#define PJMEDIA_HAS_OPENCORE_AMRWB_CODEC 0" >>confdefs.h + else + ac_no_opencore_amrwb=1 + printf "%s\n" "#define PJMEDIA_HAS_OPENCORE_AMRWB_CODEC 0" >>confdefs.h - fi + fi fi @@ -9844,34 +10044,35 @@ fi if test ${enable_silk+y} then : enableval=$enable_silk; - if test "$enable_silk" = "no"; then - ac_no_silk=1 - printf "%s\n" "#define PJMEDIA_HAS_SILK_CODEC 0" >>confdefs.h + if test "$enable_silk" = "no"; then + ac_no_silk=1 + printf "%s\n" "#define PJMEDIA_HAS_SILK_CODEC 0" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if SILK support is disabled... yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if SILK support is disabled... yes" >&5 printf "%s\n" "Checking if SILK support is disabled... yes" >&6; } - fi + fi else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for SILK installations.." >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for SILK installations.." >&5 printf "%s\n" "checking for SILK installations.." >&6; } - if test "x$with_silk" != "xno" -a "x$with_silk" != "x"; then - CFLAGS="$CFLAGS -I$with_silk/interface" - CPPFLAGS="$CPPFLAGS -I$with_silk/interface" - LDFLAGS="$LDFLAGS -L$with_silk" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using SILK prefix... $with_silk" >&5 + if test "x$with_silk" != "xno" -a "x$with_silk" != "x"; then + CFLAGS="$CFLAGS -I$with_silk/interface" + CPPFLAGS="$CPPFLAGS -I$with_silk/interface" + LDFLAGS="$LDFLAGS -L$with_silk" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using SILK prefix... $with_silk" >&5 printf "%s\n" "Using SILK prefix... $with_silk" >&6; } - fi + fi + - ac_fn_c_check_header_compile "$LINENO" "SKP_Silk_SDK_API.h" "ac_cv_header_SKP_Silk_SDK_API_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "SKP_Silk_SDK_API.h" "ac_cv_header_SKP_Silk_SDK_API_h" "$ac_includes_default" if test "x$ac_cv_header_SKP_Silk_SDK_API_h" = xyes then : silk_h_present=1 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SKP_Silk_SDK_get_version in -lSKP_SILK_SDK" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SKP_Silk_SDK_get_version in -lSKP_SILK_SDK" >&5 printf %s "checking for SKP_Silk_SDK_get_version in -lSKP_SILK_SDK... " >&6; } if test ${ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version+y} then : @@ -9908,19 +10109,22 @@ fi printf "%s\n" "$ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version" >&6; } if test "x$ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version" = xyes then : - silk_present=1 && LIBS="$LIBS -lSKP_SILK_SDK" + + silk_present=1 && LIBS="$LIBS -lSKP_SILK_SDK" fi - if test "x$silk_h_present" = "x1" -a "x$silk_present" = "x1"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SILK library found, SILK support enabled" >&5 + + if test "x$silk_h_present" = "x1" -a "x$silk_present" = "x1"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SILK library found, SILK support enabled" >&5 printf "%s\n" "SILK library found, SILK support enabled" >&6; } - printf "%s\n" "#define PJMEDIA_HAS_SILK_CODEC 1" >>confdefs.h + printf "%s\n" "#define PJMEDIA_HAS_SILK_CODEC 1" >>confdefs.h - else - ac_no_silk=1 - printf "%s\n" "#define PJMEDIA_HAS_SILK_CODEC 0" >>confdefs.h + else + ac_no_silk=1 + printf "%s\n" "#define PJMEDIA_HAS_SILK_CODEC 0" >>confdefs.h + + fi - fi fi @@ -9945,34 +10149,34 @@ fi if test ${enable_opus+y} then : enableval=$enable_opus; - if test "$enable_opus" = "no"; then - ac_no_opus=1 - printf "%s\n" "#define PJMEDIA_HAS_OPUS_CODEC 0" >>confdefs.h + if test "$enable_opus" = "no"; then + ac_no_opus=1 + printf "%s\n" "#define PJMEDIA_HAS_OPUS_CODEC 0" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if OPUS support is disabled... yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if OPUS support is disabled... yes" >&5 printf "%s\n" "Checking if OPUS support is disabled... yes" >&6; } - fi + fi else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for OPUS installations.." >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for OPUS installations.." >&5 printf "%s\n" "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" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using OPUS prefix... $with_opus" >&5 + 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" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using OPUS prefix... $with_opus" >&5 printf "%s\n" "Using OPUS prefix... $with_opus" >&6; } - fi + fi - ac_fn_c_check_header_compile "$LINENO" "opus/opus.h" "ac_cv_header_opus_opus_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for opus_repacketizer_get_size in -lopus" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for opus_repacketizer_get_size in -lopus" >&5 printf %s "checking for opus_repacketizer_get_size in -lopus... " >&6; } if test ${ac_cv_lib_opus_opus_repacketizer_get_size+y} then : @@ -10009,21 +10213,24 @@ fi printf "%s\n" "$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="-lopus $LIBS" + + opus_present=1 && LIBS="-lopus $LIBS" fi - if test "x$opus_h_present" = "x1" -a "x$opus_present" = "x1"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OPUS library found, OPUS support enabled" >&5 + + if test "x$opus_h_present" = "x1" -a "x$opus_present" = "x1"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OPUS library found, OPUS support enabled" >&5 printf "%s\n" "OPUS library found, OPUS support enabled" >&6; } - printf "%s\n" "#define PJMEDIA_HAS_OPUS_CODEC 1" >>confdefs.h + printf "%s\n" "#define PJMEDIA_HAS_OPUS_CODEC 1" >>confdefs.h - else - ac_no_opus=1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OPUS library not found, OPUS support disabled" >&5 + else + ac_no_opus=1 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OPUS library not found, OPUS support disabled" >&5 printf "%s\n" "OPUS library not found, OPUS support disabled" >&6; } - printf "%s\n" "#define PJMEDIA_HAS_OPUS_CODEC 0" >>confdefs.h + printf "%s\n" "#define PJMEDIA_HAS_OPUS_CODEC 0" >>confdefs.h + + fi - fi fi @@ -10048,73 +10255,75 @@ fi if test ${enable_bcg729+y} then : enableval=$enable_bcg729; - if test "$enable_bcg729" = "no"; then - ac_no_bcg729=1 - printf "%s\n" "#define PJMEDIA_HAS_BCG729 0" >>confdefs.h + if test "$enable_bcg729" = "no"; then + ac_no_bcg729=1 + printf "%s\n" "#define PJMEDIA_HAS_BCG729 0" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if bcg729 is disabled... yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if bcg729 is disabled... yes" >&5 printf "%s\n" "Checking if bcg729 is disabled... yes" >&6; } - fi + fi else $as_nop - if test "x$with_bcg729" != "xno" -a "x$with_bcg729" != "x"; then - BCG729_PREFIX=$with_bcg729 - BCG729_CFLAGS="-I$BCG729_PREFIX/include" - BCG729_LDFLAGS="-L$BCG729_PREFIX/lib" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using bcg729 prefix... $with_bcg729" >&5 + if test "x$with_bcg729" != "xno" -a "x$with_bcg729" != "x"; then + BCG729_PREFIX=$with_bcg729 + BCG729_CFLAGS="-I$BCG729_PREFIX/include" + BCG729_LDFLAGS="-L$BCG729_PREFIX/lib" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using bcg729 prefix... $with_bcg729" >&5 printf "%s\n" "Using bcg729 prefix... $with_bcg729" >&6; } - else - BCG729_CFLAGS="" - BCG729_LDFLAGS="" - fi + else + BCG729_CFLAGS="" + BCG729_LDFLAGS="" + fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking bcg729 usability" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking bcg729 usability" >&5 printf %s "checking bcg729 usability... " >&6; } - BCG729_LIBS="-lbcg729" + BCG729_LIBS="-lbcg729" - SAVED_LIBS="$LIBS" - SAVED_LDFLAGS="$LDFLAGS" - SAVED_CFLAGS="$CFLAGS" + SAVED_LIBS="$LIBS" + SAVED_LDFLAGS="$LDFLAGS" + SAVED_CFLAGS="$CFLAGS" - LIBS="$BCG729_LIBS $LIBS" - LDFLAGS="$BCG729_LDFLAGS $LDFLAGS" - CFLAGS="$BCG729_CFLAGS $CFLAGS" + LIBS="$BCG729_LIBS $LIBS" + LDFLAGS="$BCG729_LDFLAGS $LDFLAGS" + CFLAGS="$BCG729_CFLAGS $CFLAGS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - #include + + #include + #include int main (void) { initBcg729EncoderChannel(0); - ; return 0; } + _ACEOF if ac_fn_c_try_link "$LINENO" then : - printf "%s\n" "#define PJMEDIA_HAS_BCG729 1" >>confdefs.h + printf "%s\n" "#define PJMEDIA_HAS_BCG729 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } else $as_nop - ac_no_bcg729=1 - printf "%s\n" "#define PJMEDIA_HAS_BCG729 0" >>confdefs.h + ac_no_bcg729=1 + printf "%s\n" "#define PJMEDIA_HAS_BCG729 0" >>confdefs.h - LIBS="$SAVED_LIBS" - LDFLAGS="$SAVED_LDFLAGS" - CFLAGS="$SAVED_CFLAGS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + LIBS="$SAVED_LIBS" + LDFLAGS="$SAVED_LDFLAGS" + CFLAGS="$SAVED_CFLAGS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -10144,132 +10353,167 @@ fi if test ${enable_lyra+y} then : enableval=$enable_lyra; - if test "$enable_lyra" = "no"; then - ac_no_lyra_codec=1 - printf "%s\n" "#define PJMEDIA_HAS_LYRA_CODEC 0" >>confdefs.h + if test "$enable_lyra" = "no"; then + ac_no_lyra_codec=1 + printf "%s\n" "#define PJMEDIA_HAS_LYRA_CODEC 0" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if lyra is disabled... yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if lyra is disabled... yes" >&5 printf "%s\n" "Checking if lyra is disabled... yes" >&6; } - fi + fi else $as_nop - if test "x$with_lyra" != "xno" -a "x$with_lyra" != "x"; then - LYRA_PREFIX=$with_lyra - LYRA_CPPFLAGS="-DGLOG_DEPRECATED=__attribute__((deprecated)) -DGLOG_EXPORT=__attribute__((visibility(\"default\"))) -DGLOG_NO_EXPORT=__attribute__((visibility(\"default\")))" - LYRA_CXXFLAGS="-std=c++17 -Wno-deprecated-builtins -I$LYRA_PREFIX/include/com_google_absl -I$LYRA_PREFIX/include/gulrak_filesystem -I$LYRA_PREFIX/include/com_google_glog/src -I$LYRA_PREFIX" - LYRA_LDFLAGS="-L$LYRA_PREFIX/lib" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using lyra prefix... $with_lyra" >&5 + if test "x$with_lyra" != "xno" -a "x$with_lyra" != "x"; then + LYRA_PREFIX=$with_lyra + LYRA_CPPFLAGS="-DGLOG_DEPRECATED=__attribute__((deprecated)) -DGLOG_EXPORT=__attribute__((visibility(\"default\"))) -DGLOG_NO_EXPORT=__attribute__((visibility(\"default\")))" + LYRA_CXXFLAGS="-std=c++17 -Wno-deprecated-builtins -I$LYRA_PREFIX/include/com_google_absl -I$LYRA_PREFIX/include/gulrak_filesystem -I$LYRA_PREFIX/include/com_google_glog/src -I$LYRA_PREFIX" + LYRA_LDFLAGS="-L$LYRA_PREFIX/lib" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using lyra prefix... $with_lyra" >&5 printf "%s\n" "Using lyra prefix... $with_lyra" >&6; } - else - LYRA_CXXFLAGS="" - LYRA_LDFLAGS="" - fi + else + LYRA_CXXFLAGS="" + LYRA_LDFLAGS="" + fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking lyra usability" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking lyra usability" >&5 printf %s "checking lyra usability... " >&6; } - LYRA_LIBS="-llyra" + LYRA_LIBS="-llyra" - SAVED_LIBS="$LIBS" - SAVED_LDFLAGS="$LDFLAGS" - SAVED_CXXFLAGS="$CXXFLAGS" - SAVED_CPPFLAGS="$CPPFLAGS" + SAVED_LIBS="$LIBS" + SAVED_LDFLAGS="$LDFLAGS" + SAVED_CXXFLAGS="$CXXFLAGS" + SAVED_CPPFLAGS="$CPPFLAGS" - LIBS="$LYRA_LIBS $LIBS" - LDFLAGS="$LYRA_LDFLAGS $LDFLAGS" - CXXFLAGS="$LYRA_CXXFLAGS $CXXFLAGS" - CPPFLAGS="$LYRA_CPPFLAGS $CPPFLAGS" + LIBS="$LYRA_LIBS $LIBS" + LDFLAGS="$LYRA_LDFLAGS $LDFLAGS" + CXXFLAGS="$LYRA_CXXFLAGS $CXXFLAGS" + CPPFLAGS="$LYRA_CPPFLAGS $CPPFLAGS" - ac_ext=cpp + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include "lyra_decoder.h" + + #include "lyra_decoder.h" int main (void) { std::unique_ptr dec = chromemedia::codec::LyraDecoder::Create(8000,1,""); - ; return 0; } + _ACEOF if ac_fn_cxx_try_link "$LINENO" then : - ac_lyra_model_path="$LYRA_PREFIX/model_coeffs" - printf "%s\n" "#define PJMEDIA_HAS_LYRA_CODEC 1" >>confdefs.h + ac_lyra_model_path="$LYRA_PREFIX/model_coeffs" + printf "%s\n" "#define PJMEDIA_HAS_LYRA_CODEC 1" >>confdefs.h - LYRA_CPPFLAGS="'-DGLOG_DEPRECATED=__attribute__((deprecated))' '-DGLOG_EXPORT=__attribute__((visibility(\"default\")))' '-DGLOG_NO_EXPORT=__attribute__((visibility(\"default\")))'" - CXXFLAGS="$LYRA_CPPFLAGS $CXXFLAGS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + LYRA_CPPFLAGS="'-DGLOG_DEPRECATED=__attribute__((deprecated))' '-DGLOG_EXPORT=__attribute__((visibility(\"default\")))' '-DGLOG_NO_EXPORT=__attribute__((visibility(\"default\")))'" + CXXFLAGS="$LYRA_CPPFLAGS $CXXFLAGS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } else $as_nop - ac_no_lyra_codec=1 - LIBS="$SAVED_LIBS" - LDFLAGS="$SAVED_LDFLAGS" - CXXFLAGS="$SAVED_CXXFLAGS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + ac_no_lyra_codec=1 + LIBS="$SAVED_LIBS" + LDFLAGS="$SAVED_LDFLAGS" + CXXFLAGS="$SAVED_CXXFLAGS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - ac_ext=c + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - CPPFLAGS="$SAVED_CPPFLAGS" - -fi + CPPFLAGS="$SAVED_CPPFLAGS" +fi # Check whether --enable-libsrtp was given. if test ${enable_libsrtp+y} then : - enableval=$enable_libsrtp; if test "$enable_libsrtp" = "no"; then - ac_no_srtp=1 - CFLAGS="$CFLAGS -DPJMEDIA_HAS_SRTP=0" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libsrtp is disabled...yes" >&5 + enableval=$enable_libsrtp; + if test "$enable_libsrtp" = "no"; then + ac_no_srtp=1 + CFLAGS="$CFLAGS -DPJMEDIA_HAS_SRTP=0" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libsrtp is disabled...yes" >&5 printf "%s\n" "Checking if libsrtp is disabled...yes" >&6; } - fi + fi + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libsrtp is disabled...no" >&5 printf "%s\n" "Checking if libsrtp is disabled...no" >&6; } -fi +fi # Check whether --enable-libyuv was given. if test ${enable_libyuv+y} then : - enableval=$enable_libyuv; if test "$enable_libyuv" = "no"; then - ac_no_yuv=1 - printf "%s\n" "#define PJMEDIA_HAS_LIBYUV 0" >>confdefs.h + enableval=$enable_libyuv; + if test "$enable_libyuv" = "no"; then + ac_no_yuv=1 + printf "%s\n" "#define PJMEDIA_HAS_LIBYUV 0" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libyuv is disabled...yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libyuv is disabled...yes" >&5 printf "%s\n" "Checking if libyuv is disabled...yes" >&6; } - fi + fi + else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libyuv is disabled...no" >&5 printf "%s\n" "Checking if libyuv is disabled...no" >&6; } + fi +SAVED_CFLAGS="$CFLAGS" +case $target_cpu in + arm*) + CFLAGS="-mfpu=neon $CFLAGS" + ;; + aarch64*) + CFLAGS="-march=armv8-a+simd $CFLAGS" + ;; +esac +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ax_cv_support_neon_ext=yes +else $as_nop + ax_cv_support_neon_ext=no + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CFLAGS="$SAVED_CFLAGS" @@ -10278,82 +10522,97 @@ fi # Check whether --enable-libwebrtc was given. if test ${enable_libwebrtc+y} then : - enableval=$enable_libwebrtc; if test "$enable_libwebrtc" = "no"; then - ac_no_webrtc=1 - printf "%s\n" "#define PJMEDIA_HAS_LIBWEBRTC 0" >>confdefs.h + enableval=$enable_libwebrtc; + if test "$enable_libwebrtc" = "no"; then + ac_no_webrtc=1 + printf "%s\n" "#define PJMEDIA_HAS_LIBWEBRTC 0" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libwebrtc is disabled...yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libwebrtc is disabled...yes" >&5 printf "%s\n" "Checking if libwebrtc is disabled...yes" >&6; } - fi + fi + else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libwebrtc is disabled...no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libwebrtc is disabled...no" >&5 printf "%s\n" "Checking if libwebrtc is disabled...no" >&6; } - case $target in - *-apple-darwin_ios*) - case $target in - arm64*) - ac_webrtc_instset=neon - ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64" - ;; - *arm*) - ac_webrtc_instset=neon - ;; - *) - ac_webrtc_instset=sse2 - ;; - esac - ;; - *android*) - case $TARGET_ABI in - armeabi-v7a) - ac_webrtc_instset=neon - ac_webrtc_cflags="-mfloat-abi=softfp -mfpu=neon" - ;; - armeabi) - ac_webrtc_instset=neon - ac_webrtc_cflags="-mthumb -mfloat-abi=softfp -mfpu=neon -march=armv7" - ;; - arm64*) - ac_webrtc_instset=neon - ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64" - ;; - mips64*) - ac_webrtc_instset=generic - ;; - mips*) - ac_webrtc_instset=mips - ;; - x86*) - ac_webrtc_instset=sse2 - ;; - *) - ac_webrtc_instset=generic - ;; - esac - ;; - *mingw* | *cygw*) - ac_webrtc_instset=sse2 - ac_webrtc_cflags="-msse2" - ;; - *win32* | *w32* | *darwin* | *linux*) - case $target in - armv7l*gnueabihf) - ac_webrtc_instset=neon - ac_webrtc_cflags="-DWEBRTC_ARCH_ARM_V7 -mfloat-abi=hard -mfpu=neon" - ;; - arm-apple-darwin* | aarch64*) - ac_webrtc_instset=neon - ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64" - ;; - *) - ac_webrtc_instset=sse2 - ;; - esac - ;; - *) - ;; - esac + case $target in + *-apple-darwin_ios*) + case $target in + arm64*) + ac_webrtc_instset=neon + ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64" + ;; + *arm*) + ac_webrtc_instset=neon + ;; + *) + ac_webrtc_instset=sse2 + ;; + esac + ;; + *android*) + case $TARGET_ABI in + armeabi-v7a) + ac_webrtc_instset=neon + ac_webrtc_cflags="-mfloat-abi=softfp -mfpu=neon" + ;; + armeabi) + ac_webrtc_instset=neon + ac_webrtc_cflags="-mthumb -mfloat-abi=softfp -mfpu=neon -march=armv7" + ;; + arm64*) + ac_webrtc_instset=neon + ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64" + ;; + mips64*) + ac_webrtc_instset=generic + ;; + mips*) + ac_webrtc_instset=mips + ;; + x86*) + ac_webrtc_instset=sse2 + ;; + *) + ac_webrtc_instset=generic + ;; + esac + ;; + *mingw* | *cygw*) + ac_webrtc_instset=sse2 + ac_webrtc_cflags="-msse2" + ;; + *win32* | *w32* | *darwin* | *linux*) + case $target in + arm*gnueabihf) + if test "x$ax_cv_support_neon_ext" = "xyes"; then + ac_webrtc_instset=neon + ac_webrtc_cflags="-DWEBRTC_ARCH_ARM_V7 -mfloat-abi=hard -mfpu=neon" + else + ac_webrtc_instset=generic + fi + ;; + aarch64*) + if test "x$ax_cv_support_neon_ext" = "xyes"; then + ac_webrtc_instset=neon + ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64" + else + ac_webrtc_instset=generic + fi + ;; + arm-apple-darwin*) + ac_webrtc_instset=neon + ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64" + ;; + *) + ac_webrtc_instset=sse2 + ;; + esac + ;; + *) + ;; + esac + fi @@ -10367,23 +10626,24 @@ fi if test ${enable_libwebrtc_aec3+y} then : enableval=$enable_libwebrtc_aec3; - if test "$enable_libwebrtc_aec3" = "yes"; then - # Test if we can build WebRtc AEC3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if WebRtc AEC3 can be compiled with C++17" >&5 + if test "$enable_libwebrtc_aec3" = "yes"; then + # Test if we can build WebRtc AEC3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if WebRtc AEC3 can be compiled with C++17" >&5 printf %s "checking if WebRtc AEC3 can be compiled with C++17... " >&6; } - SAVED_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -std=c++17" + SAVED_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -std=c++17" - ac_ext=cpp + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main (void) { @@ -10391,113 +10651,132 @@ main (void) ; return 0; } + _ACEOF if ac_fn_cxx_try_link "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - LD="$CXX" + LD="$CXX" + else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - CXXFLAGS="$SAVED_CXXFLAGS" - ac_no_webrtc_aec3=1 - printf "%s\n" "#define PJMEDIA_HAS_LIBWEBRTC_AEC3 0" >>confdefs.h + CXXFLAGS="$SAVED_CXXFLAGS" + ac_no_webrtc_aec3=1 + printf "%s\n" "#define PJMEDIA_HAS_LIBWEBRTC_AEC3 0" >>confdefs.h + + fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - ac_ext=c + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - case $target in - *-apple-darwin_ios*) - case $target in - arm64*) - ac_webrtc_aec3_instset=neon - ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM64" - ;; - *arm*) - ac_webrtc_aec3_instset=neon - ;; - *) - ac_webrtc_aec3_instset=sse2 - ;; - esac - ac_webrtc_aec3_cflags+=" -DWEBRTC_IOS=1" - ;; - *android*) - case $TARGET_ABI in - armeabi-v7a) - ac_webrtc_aec3_instset=neon - ac_webrtc_aec3_cflags="-mfloat-abi=softfp -mfpu=neon" - ;; - armeabi) - ac_webrtc_aec3_instset=neon - ac_webrtc_aec3_cflags="-mthumb -mfloat-abi=softfp -mfpu=neon -march=armv7" - ;; - arm64*) - ac_webrtc_aec3_instset=neon - ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM64" - ;; - x86*) - ac_webrtc_aec3_instset=sse2 - ;; - esac - ac_webrtc_aec3_cflags+=" -DWEBRTC_ANDROID=1" - ;; - *mingw* | *cygw*) - ac_webrtc_aec3_instset=sse2 - ac_webrtc_aec3_cflags="-msse2" - ;; - *win32* | *w32* | *darwin* | *linux*) - case $target in - armv7l*gnueabihf) - ac_webrtc_aec3_instset=neon - ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM_V7 -mfloat-abi=hard -mfpu=neon" - ;; - arm-apple-darwin* | aarch64*) - ac_webrtc_aec3_instset=neon - ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM64" - ;; - *) - ac_webrtc_aec3_instset=sse2 - ;; - esac - case $target in - *darwin*) - ac_webrtc_aec3_cflags+=" -DWEBRTC_MAC=1" - ;; - *linux*) - ac_webrtc_aec3_cflags+=" -DWEBRTC_LINUX=1" - ;; - esac - ;; - *) - ;; - esac - ac_webrtc_aec3_cflags+=" -DWEBRTC_APM_DEBUG_DUMP=0 -DWEBRTC_POSIX=1" - else - ac_no_webrtc_aec3=1 - printf "%s\n" "#define PJMEDIA_HAS_LIBWEBRTC_AEC3 0" >>confdefs.h - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libwebrtc-aec3 is enabled...no" >&5 + case $target in + *-apple-darwin_ios*) + case $target in + arm64*) + ac_webrtc_aec3_instset=neon + ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM64" + ;; + *arm*) + ac_webrtc_aec3_instset=neon + ;; + *) + ac_webrtc_aec3_instset=sse2 + ;; + esac + ac_webrtc_aec3_cflags+=" -DWEBRTC_IOS=1" + ;; + *android*) + case $TARGET_ABI in + armeabi-v7a) + ac_webrtc_aec3_instset=neon + ac_webrtc_aec3_cflags="-mfloat-abi=softfp -mfpu=neon" + ;; + armeabi) + ac_webrtc_aec3_instset=neon + ac_webrtc_aec3_cflags="-mthumb -mfloat-abi=softfp -mfpu=neon -march=armv7" + ;; + arm64*) + ac_webrtc_aec3_instset=neon + ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM64" + ;; + x86*) + ac_webrtc_aec3_instset=sse2 + ;; + esac + ac_webrtc_aec3_cflags+=" -DWEBRTC_ANDROID=1" + ;; + *mingw* | *cygw*) + ac_webrtc_aec3_instset=sse2 + ac_webrtc_aec3_cflags="-msse2" + ;; + *win32* | *w32* | *darwin* | *linux*) + case $target in + arm*gnueabihf) + if test "x$ax_cv_support_neon_ext" = "xyes"; then + ac_webrtc_aec3_instset=neon + ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM_V7 -mfloat-abi=hard -mfpu=neon" + else + ac_webrtc_aec3_instset=generic + fi + ;; + aarch64*) + if test "x$ax_cv_support_neon_ext" = "xyes"; then + ac_webrtc_aec3_instset=neon + ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM64" + else + ac_webrtc_aec3_instset=generic + fi + ;; + arm-apple-darwin*) + ac_webrtc_aec3_instset=neon + ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM64" + ;; + *) + ac_webrtc_aec3_instset=sse2 + ;; + esac + case $target in + *darwin*) + ac_webrtc_aec3_cflags+=" -DWEBRTC_MAC=1" + ;; + *linux*) + ac_webrtc_aec3_cflags+=" -DWEBRTC_LINUX=1" + ;; + esac + ;; + *) + ;; + esac + ac_webrtc_aec3_cflags+=" -DWEBRTC_APM_DEBUG_DUMP=0 -DWEBRTC_POSIX=1" + else + ac_no_webrtc_aec3=1 + printf "%s\n" "#define PJMEDIA_HAS_LIBWEBRTC_AEC3 0" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libwebrtc-aec3 is enabled...no" >&5 printf "%s\n" "Checking if libwebrtc-aec3 is enabled...no" >&6; } - fi + fi else $as_nop - ac_no_webrtc_aec3=1 - printf "%s\n" "#define PJMEDIA_HAS_LIBWEBRTC_AEC3 0" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libwebrtc-aec3 is enabled...no" >&5 + ac_no_webrtc_aec3=1 + printf "%s\n" "#define PJMEDIA_HAS_LIBWEBRTC_AEC3 0" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libwebrtc-aec3 is enabled...no" >&5 printf "%s\n" "Checking if libwebrtc-aec3 is enabled...no" >&6; } -fi +fi @@ -10505,99 +10784,107 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if select() needs correct nfds" >&5 printf %s "checking if select() needs correct nfds... " >&6; } case $target in - *rtems*) printf "%s\n" "#define PJ_SELECT_NEEDS_NFDS 1" >>confdefs.h + *rtems*) + printf "%s\n" "#define PJ_SELECT_NEEDS_NFDS 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - ;; - *) printf "%s\n" "#define PJ_SELECT_NEEDS_NFDS 0" >>confdefs.h + ;; + *) + printf "%s\n" "#define PJ_SELECT_NEEDS_NFDS 0" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (default)" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (default)" >&5 printf "%s\n" "no (default)" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ** Decided that select() doesn't need correct nfds (please check)" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ** Decided that select() doesn't need correct nfds (please check)" >&5 printf "%s\n" "** Decided that select() doesn't need correct nfds (please check)" >&6; } - ;; + ;; esac { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if pj_thread_create() should enforce stack size" >&5 printf %s "checking if pj_thread_create() should enforce stack size... " >&6; } case $target in - *rtems*) printf "%s\n" "#define PJ_THREAD_SET_STACK_SIZE 1" >>confdefs.h + *rtems*) + printf "%s\n" "#define PJ_THREAD_SET_STACK_SIZE 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - ;; - *) printf "%s\n" "#define PJ_THREAD_SET_STACK_SIZE 0" >>confdefs.h + ;; + *) + printf "%s\n" "#define PJ_THREAD_SET_STACK_SIZE 0" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (default)" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (default)" >&5 printf "%s\n" "no (default)" >&6; } - ;; + ;; esac { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if pj_thread_create() should allocate stack" >&5 printf %s "checking if pj_thread_create() should allocate stack... " >&6; } case $target in - *rtems*) printf "%s\n" "#define PJ_THREAD_ALLOCATE_STACK 1" >>confdefs.h + *rtems*) + printf "%s\n" "#define PJ_THREAD_ALLOCATE_STACK 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - ;; - *) printf "%s\n" "#define PJ_THREAD_ALLOCATE_STACK 0" >>confdefs.h + ;; + *) + printf "%s\n" "#define PJ_THREAD_ALLOCATE_STACK 0" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (default)" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (default)" >&5 printf "%s\n" "no (default)" >&6; } - ;; + ;; esac case $target in - *mingw* | *cygw* | *win32* | *w32* ) - printf "%s\n" "#define PJ_BLOCKING_ERROR_VAL WSAEWOULDBLOCK" >>confdefs.h + *mingw* | *cygw* | *win32* | *w32* ) + printf "%s\n" "#define PJ_BLOCKING_ERROR_VAL WSAEWOULDBLOCK" >>confdefs.h - ;; - *) printf "%s\n" "#define PJ_BLOCKING_ERROR_VAL EAGAIN" >>confdefs.h + ;; + *) + printf "%s\n" "#define PJ_BLOCKING_ERROR_VAL EAGAIN" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ** Setting non-blocking recv() retval to EAGAIN (please check)" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ** Setting non-blocking recv() retval to EAGAIN (please check)" >&5 printf "%s\n" "** Setting non-blocking recv() retval to EAGAIN (please check)" >&6; } - ;; + ;; esac case $target in - *mingw* | *cygw* | *win32* | *w32* ) - printf "%s\n" "#define PJ_BLOCKING_CONNECT_ERROR_VAL WSAEWOULDBLOCK" >>confdefs.h + *mingw* | *cygw* | *win32* | *w32* ) + printf "%s\n" "#define PJ_BLOCKING_CONNECT_ERROR_VAL WSAEWOULDBLOCK" >>confdefs.h - ;; - *) printf "%s\n" "#define PJ_BLOCKING_CONNECT_ERROR_VAL EINPROGRESS" >>confdefs.h + ;; + *) + printf "%s\n" "#define PJ_BLOCKING_CONNECT_ERROR_VAL EINPROGRESS" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ** Setting non-blocking connect() retval to EINPROGRESS (please check)" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ** Setting non-blocking connect() retval to EINPROGRESS (please check)" >&5 printf "%s\n" "** Setting non-blocking connect() retval to EINPROGRESS (please check)" >&6; } - ;; + ;; esac case $target in - *linux* | *darwin* | *bsd*) - ac_fn_c_check_header_compile "$LINENO" "pthread_np.h" "ac_cv_header_pthread_np_h" "$ac_includes_default" + *linux* | *darwin* | *bsd*) + ac_fn_c_check_header_compile "$LINENO" "pthread_np.h" "ac_cv_header_pthread_np_h" "$ac_includes_default" if test "x$ac_cv_header_pthread_np_h" = xyes then : printf "%s\n" "#define PJ_HAS_PTHREAD_NP_H 1" >>confdefs.h fi - ac_fn_c_check_func "$LINENO" "pthread_setname_np" "ac_cv_func_pthread_setname_np" + ac_fn_c_check_func "$LINENO" "pthread_setname_np" "ac_cv_func_pthread_setname_np" if test "x$ac_cv_func_pthread_setname_np" = xyes then : printf "%s\n" "#define PJ_HAS_PTHREAD_SETNAME_NP 1" >>confdefs.h fi - ac_fn_c_check_func "$LINENO" "pthread_set_name_np" "ac_cv_func_pthread_set_name_np" + ac_fn_c_check_func "$LINENO" "pthread_set_name_np" "ac_cv_func_pthread_set_name_np" if test "x$ac_cv_func_pthread_set_name_np" = xyes then : printf "%s\n" "#define PJ_HAS_PTHREAD_SET_NAME_NP 1" >>confdefs.h fi - ;; + ;; esac @@ -10606,12 +10893,12 @@ ac_host=unix case $target in - *rtems*) - ac_main_obj=main_rtems.o - ;; - *) - ac_main_obj=main.o - ;; + *rtems*) + ac_main_obj=main_rtems.o + ;; + *) + ac_main_obj=main.o + ;; esac @@ -11896,7 +12183,6 @@ printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Configurations for current target have been written to 'build.mak', and 'os-auto.mak' in various build directories, and pjlib/include/pj/compat/os_auto.h. diff --git a/aconfigure.ac b/aconfigure.ac index 1ca2797f73..9095dbf2ce 100644 --- a/aconfigure.ac +++ b/aconfigure.ac @@ -5,28 +5,30 @@ host_orig="$host" AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_CANONICAL_TARGET -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([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 - ]) +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([ + 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 +]) dnl dnl Setup default CFLAGS dnl if test "$CFLAGS" = ""; then - CFLAGS="-O2" + CFLAGS="-O2" fi dnl # @@ -71,31 +73,31 @@ AC_SUBST(ac_pjdir) AC_SUBST(ac_build_mak_vars) AC_SUBST(ac_cflags) -case $host in +case $host in *mingw* | *cygw* | *win32* | *w32* ) - if pwd -W 2&> /dev/null; then - ac_pjdir=`pwd -W` - else - # We're probably cross-compiling mingw on Linux - ac_pjdir=`pwd` - fi - ;; + if pwd -W 2&> /dev/null; then + ac_pjdir=`pwd -W` + else + # We're probably cross-compiling mingw on Linux + ac_pjdir=`pwd` + fi + ;; *) - ac_pjdir=`pwd` - ;; + ac_pjdir=`pwd` + ;; esac AC_SUBST(ac_shlib_suffix) case $target in *mingw* | *cygw* | *win32* | *w32* ) - ac_shlib_suffix=dll - ;; + ac_shlib_suffix=dll + ;; *darwin*) - ac_shlib_suffix=dylib - ;; + ac_shlib_suffix=dylib + ;; *) - ac_shlib_suffix=so - ;; + ac_shlib_suffix=so + ;; esac AC_SUBST(ac_cross_compile) @@ -113,21 +115,24 @@ AC_CHECK_LIB(winmm,puts) AC_CHECK_LIB(socket,puts) AC_CHECK_LIB(rt,puts) AC_CHECK_LIB(m,sin) +AC_CHECK_PROGS(PKG_CONFIG,$host_cpu-$host_os-pkg-config $host-pkg-config pkg-config "python pkgconfig.py",none) dnl dnl libuuid dnl AC_ARG_ENABLE(libuuid, - AS_HELP_STRING([--disable-libuuid], - [Exclude libuuid(default: autodetect)]), - [if test "$enable_libuuid" = "no"; then - AC_MSG_RESULT([Checking if libuuid disabled... yes]) - ac_has_uuid_lib=0 - fi], - [ - AC_CHECK_LIB(uuid,uuid_generate) - AC_CHECK_LIB(uuid,uuid_generate,[ac_has_uuid_lib=1]) - ]) + AS_HELP_STRING([--disable-libuuid], [Exclude libuuid(default: autodetect)]), + [ + if test "$enable_libuuid" = "no"; then + AC_MSG_RESULT([Checking if libuuid disabled... yes]) + ac_has_uuid_lib=0 + fi + ], + [ + AC_CHECK_LIB(uuid,uuid_generate) + AC_CHECK_LIB(uuid,uuid_generate,[ac_has_uuid_lib=1]) + ] +) AC_SEARCH_LIBS(gethostbyname,nsl) @@ -140,13 +145,13 @@ dnl AC_MSG_CHECKING([memory alignment]) case $target in sparc64-* | ia64-* | x86_64-* | arm64-* | aarch64-* | mips64* ) - AC_DEFINE(PJ_POOL_ALIGNMENT, 8) - AC_MSG_RESULT([8 bytes]) - ;; + AC_DEFINE(PJ_POOL_ALIGNMENT, 8) + AC_MSG_RESULT([8 bytes]) + ;; * ) - AC_DEFINE(PJ_POOL_ALIGNMENT, 4) - AC_MSG_RESULT([4 bytes (default)]) - ;; + AC_DEFINE(PJ_POOL_ALIGNMENT, 4) + AC_MSG_RESULT([4 bytes (default)]) + ;; esac @@ -156,11 +161,11 @@ dnl AC_C_BIGENDIAN if test "x$ac_cv_c_bigendian" = "xyes"; then - CFLAGS="$CFLAGS -DPJ_IS_BIG_ENDIAN=1 -DPJ_IS_LITTLE_ENDIAN=0" - ac_cflags="$ac_cflags -DPJ_IS_BIG_ENDIAN=1 -DPJ_IS_LITTLE_ENDIAN=0" + CFLAGS="$CFLAGS -DPJ_IS_BIG_ENDIAN=1 -DPJ_IS_LITTLE_ENDIAN=0" + ac_cflags="$ac_cflags -DPJ_IS_BIG_ENDIAN=1 -DPJ_IS_LITTLE_ENDIAN=0" else - CFLAGS="$CFLAGS -DPJ_IS_BIG_ENDIAN=0 -DPJ_IS_LITTLE_ENDIAN=1" - ac_cflags="$ac_cflags -DPJ_IS_BIG_ENDIAN=0 -DPJ_IS_LITTLE_ENDIAN=1" + CFLAGS="$CFLAGS -DPJ_IS_BIG_ENDIAN=0 -DPJ_IS_LITTLE_ENDIAN=1" + ac_cflags="$ac_cflags -DPJ_IS_BIG_ENDIAN=0 -DPJ_IS_LITTLE_ENDIAN=1" fi dnl @@ -170,52 +175,54 @@ AC_SUBST(ac_target_arch) AC_SUBST(ac_std_cpp_lib) case $target in *android*) - AC_DEFINE(PJ_ANDROID,1) - ac_target_arch=$TARGET_ABI - ac_std_cpp_lib=$STD_CPP_LIB - ;; + AC_DEFINE(PJ_ANDROID,1) + ac_target_arch=$TARGET_ABI + ac_std_cpp_lib=$STD_CPP_LIB + ;; *mingw* | *cygw* | *win32* | *w32* ) - AC_DEFINE(PJ_WIN32,1) - AC_DEFINE(PJ_WIN32_WINNT,0x0400) - AC_DEFINE(WIN32_LEAN_AND_MEAN) - case $target in - *_64-w64-mingw* ) - AC_DEFINE(PJ_WIN64,1) - ;; - esac - ;; + AC_DEFINE(PJ_WIN32,1) + AC_DEFINE(PJ_WIN32_WINNT,0x0501) + AC_DEFINE(WIN32_LEAN_AND_MEAN) + case $target in + *_64-w64-mingw* ) + AC_DEFINE(PJ_WIN64,1) + ;; + esac + ;; *darwin*) - AC_DEFINE(PJ_DARWINOS,1) - ac_target_arch=$ARCH_VAL - ;; + AC_DEFINE(PJ_DARWINOS,1) + ac_target_arch=$ARCH_VAL + ;; *linux*) - AC_DEFINE(PJ_LINUX,1) - ;; + AC_DEFINE(PJ_LINUX,1) + ;; *bsd*) - AC_DEFINE(PJ_BSD,1) - ;; + AC_DEFINE(PJ_BSD,1) + ;; *rtems*) - AC_DEFINE(PJ_RTEMS,1) - ;; + AC_DEFINE(PJ_RTEMS,1) + ;; *sunos* | *solaris* ) - AC_DEFINE(PJ_SUNOS,1) - ;; + AC_DEFINE(PJ_SUNOS,1) + ;; *) - ;; + ;; esac dnl # --disable-floating-point option AC_ARG_ENABLE(floating-point, - AS_HELP_STRING([--disable-floating-point], - [Disable floating point where possible]), - [if test "$enable_floating_point" = "no"; then - AC_DEFINE(PJ_HAS_FLOATING_POINT,0) - AC_MSG_RESULT([Checking if floating point is disabled... yes]) - fi], - [ - AC_DEFINE(PJ_HAS_FLOATING_POINT,1) - AC_MSG_RESULT([Checking if floating point is disabled... no]) - ]) + AS_HELP_STRING([--disable-floating-point], [Disable floating point where possible]), + [ + if test "$enable_floating_point" = "no"; then + AC_DEFINE(PJ_HAS_FLOATING_POINT,0) + AC_MSG_RESULT([Checking if floating point is disabled... yes]) + fi + ], + [ + AC_DEFINE(PJ_HAS_FLOATING_POINT,1) + AC_MSG_RESULT([Checking if floating point is disabled... no]) + ] +) AC_CHECK_HEADER(arpa/inet.h,[AC_DEFINE(PJ_HAS_ARPA_INET_H,1)]) @@ -224,11 +231,11 @@ AC_CHECK_HEADER(ctype.h,[AC_DEFINE(PJ_HAS_CTYPE_H,1)]) case $target in *mingw* | *cygw* | *win32* | *w32* ) - AC_DEFINE(PJ_HAS_ERRNO_H,0) - ;; + AC_DEFINE(PJ_HAS_ERRNO_H,0) + ;; *) - AC_CHECK_HEADER(errno.h,[AC_DEFINE(PJ_HAS_ERRNO_H,1)]) - ;; + AC_CHECK_HEADER(errno.h,[AC_DEFINE(PJ_HAS_ERRNO_H,1)]) + ;; esac AC_CHECK_HEADER(fcntl.h,[AC_DEFINE(PJ_HAS_FCNTL_H,1)]) @@ -239,19 +246,21 @@ AC_CHECK_HEADER(netdb.h,[AC_DEFINE(PJ_HAS_NETDB_H,1)]) AC_CHECK_HEADER(netinet/in_systm.h,[AC_DEFINE(PJ_HAS_NETINET_IN_SYSTM_H,1)]) AC_CHECK_HEADER(netinet/in.h,[AC_DEFINE(PJ_HAS_NETINET_IN_H,1)]) AC_CHECK_HEADER(netinet/ip.h,[AC_DEFINE(PJ_HAS_NETINET_IP_H,1)],[], - [#if PJ_HAS_SYS_TYPES_H - # include - #endif - #if PJ_HAS_NETINET_IN_SYSTM_H - # include - #endif - #if PJ_HAS_NETINET_IN_H - # include - #endif - ]) + [ + #if PJ_HAS_SYS_TYPES_H + # include + #endif + #if PJ_HAS_NETINET_IN_SYSTM_H + # include + #endif + #if PJ_HAS_NETINET_IN_H + # include + #endif + ] +) + AC_CHECK_HEADER(netinet/tcp.h,[AC_DEFINE(PJ_HAS_NETINET_TCP_H,1)]) -AC_CHECK_HEADER(ifaddrs.h, - [AC_CHECK_FUNC(getifaddrs,[AC_DEFINE(PJ_HAS_IFADDRS_H,1)])]) +AC_CHECK_HEADER(ifaddrs.h, [AC_CHECK_FUNC(getifaddrs,[AC_DEFINE(PJ_HAS_IFADDRS_H,1)])]) AC_CHECK_HEADER(semaphore.h,[AC_DEFINE(PJ_HAS_SEMAPHORE_H,1)]) AC_CHECK_HEADER(setjmp.h,[AC_DEFINE(PJ_HAS_SETJMP_H,1)]) AC_CHECK_HEADER(stdarg.h,[AC_DEFINE(PJ_HAS_STDARG_H,1)]) @@ -276,28 +285,32 @@ AC_CHECK_HEADER(execinfo.h,[AC_DEFINE(PJ_HAS_EXECINFO_H,1)]) AC_CHECK_HEADER(winsock.h,[AC_DEFINE(PJ_HAS_WINSOCK_H,1)]) AC_CHECK_HEADER(winsock2.h,[AC_DEFINE(PJ_HAS_WINSOCK2_H,1)]) AC_CHECK_HEADER(mswsock.h,[AC_DEFINE(PJ_HAS_MSWSOCK_H,1)],[], - [#if PJ_HAS_WINSOCK2_H - # include - #elif PJ_HAS_WINSOCK_H - # include - #endif - ]) + [ + #if PJ_HAS_WINSOCK2_H + # include + #elif PJ_HAS_WINSOCK_H + # include + #endif + ] +) + AC_CHECK_HEADER(ws2tcpip.h,[AC_DEFINE(PJ_HAS_WS2TCPIP_H,1)]) AC_CHECK_HEADER(uuid/uuid.h,[ac_has_uuid_h=1]) AC_CHECK_HEADER(net/if.h,[AC_DEFINE(PJ_HAS_NET_IF_H,1)],[], - [#if PJ_HAS_SYS_TYPES_H - # include - #endif - #if PJ_HAS_SYS_SOCKET_H - - # include - #endif - ]) + [ + #if PJ_HAS_SYS_TYPES_H + # include + #endif + #if PJ_HAS_SYS_SOCKET_H + # include + #endif + ] +) case $target in - *android*) - AC_CHECK_HEADER(linux/android_alarm.h,[AC_DEFINE(PJ_HAS_ANDROID_ALARM_H,1)]) - ;; + *android*) + AC_CHECK_HEADER(linux/android_alarm.h,[AC_DEFINE(PJ_HAS_ANDROID_ALARM_H,1)]) + ;; esac AC_CHECK_FUNC(localtime_r,[AC_DEFINE(PJ_HAS_LOCALTIME_R,1)]) @@ -322,147 +335,239 @@ AC_DEFINE(PJ_ATOMIC_VALUE_TYPE,long) dnl # Determine if inet_aton() is available AC_MSG_CHECKING([if inet_aton() is available]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - #include - #include ]], - [inet_aton(0, 0);])], - [AC_DEFINE(PJ_SOCK_HAS_INET_ATON,1) - AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no)]) +AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include + #include + #include ]], + [inet_aton(0, 0);]) + ], + [ + AC_DEFINE(PJ_SOCK_HAS_INET_ATON,1) + AC_MSG_RESULT(yes) + ], + [AC_MSG_RESULT(no)] +) dnl # Determine if inet_pton() is available AC_MSG_CHECKING([if inet_pton() is available]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - #include - #include ]], - [inet_pton(0, 0, 0);])], - [AC_DEFINE(PJ_SOCK_HAS_INET_PTON,1) - AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no)]) +AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include + #include + #include ]], + [inet_pton(0, 0, 0);]) + ], + [ + AC_DEFINE(PJ_SOCK_HAS_INET_PTON,1) + AC_MSG_RESULT(yes) + ], + [AC_MSG_RESULT(no)] +) dnl # Determine if inet_ntop() is available AC_MSG_CHECKING([if inet_ntop() is available]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - #include - #include ]], - [inet_ntop(0, 0, 0, 0);])], - [AC_DEFINE(PJ_SOCK_HAS_INET_NTOP,1) - AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no)]) +AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include + #include + #include ]], + [inet_ntop(0, 0, 0, 0);]) + ], + [ + AC_DEFINE(PJ_SOCK_HAS_INET_NTOP,1) + AC_MSG_RESULT(yes) + ], + [AC_MSG_RESULT(no)] +) dnl # Determine if getaddrinfo() is available AC_MSG_CHECKING([if getaddrinfo() is available]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - #include - #include ]], - [getaddrinfo(0, 0, 0, 0);])], - [AC_DEFINE(PJ_SOCK_HAS_GETADDRINFO,1) - AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no)]) +AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include + #include + #include ]], + [getaddrinfo(0, 0, 0, 0);]) + ], + [ + AC_DEFINE(PJ_SOCK_HAS_GETADDRINFO,1) + AC_MSG_RESULT(yes) + ], + [AC_MSG_RESULT(no)] +) dnl # Determine if socketpair() is available AC_MSG_CHECKING([if socketpair() is available]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - #include ]], - [socketpair(0, 0, 0, 0);])], - [AC_DEFINE(PJ_SOCK_HAS_SOCKETPAIR,1) - AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no)]) +AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include + #include ]], + [socketpair(0, 0, 0, 0);]) + ], + [ + AC_DEFINE(PJ_SOCK_HAS_SOCKETPAIR,1) + AC_MSG_RESULT(yes) + ], + [AC_MSG_RESULT(no)] +) dnl # Determine if sockaddr_in has sin_len member AC_MSG_CHECKING([if sockaddr_in has sin_len member]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - #include - #include - #include ]], - [struct sockaddr_in a; a.sin_len=0;])], - [AC_DEFINE(PJ_SOCKADDR_HAS_LEN,1) - AC_MSG_RESULT(yes)], - AC_MSG_RESULT(no)) +AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include + #include + #include + #include ]], + [struct sockaddr_in a; a.sin_len=0;]) + ], + [ + AC_DEFINE(PJ_SOCKADDR_HAS_LEN,1) + AC_MSG_RESULT(yes) + ], + [AC_MSG_RESULT(no)] +) dnl # Determine if socklen_t is available AC_MSG_CHECKING([if socklen_t is available]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - #include ]], - [socklen_t xxx = 0;])], - [AC_DEFINE(PJ_HAS_SOCKLEN_T,1) - AC_MSG_RESULT(yes)], - AC_MSG_RESULT(no)) +AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include + #include ]], + [socklen_t xxx = 0;]) + ], + [ + AC_DEFINE(PJ_HAS_SOCKLEN_T,1) + AC_MSG_RESULT(yes) + ], + [AC_MSG_RESULT(no)] +) dnl # Determine if IPV6_V6ONLY is available AC_MSG_CHECKING([if IPV6_V6ONLY is available]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - #include ]], - [int opt = IPV6_V6ONLY;])], - [AC_DEFINE(PJ_SOCK_HAS_IPV6_V6ONLY,1) - AC_MSG_RESULT(yes)], - AC_MSG_RESULT(no)) +AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include + #include ]], + [int opt = IPV6_V6ONLY;]) + ], + [ + AC_DEFINE(PJ_SOCK_HAS_IPV6_V6ONLY,1) + AC_MSG_RESULT(yes) + ], + [AC_MSG_RESULT(no)] +) dnl # Determine if SO_ERROR is available AC_MSG_CHECKING([if SO_ERROR is available]) case $target in *mingw* | *cygw* | *win32* | *w32* ) - AC_DEFINE(PJ_HAS_SO_ERROR,1) - AC_MSG_RESULT(yes) - ;; + AC_DEFINE(PJ_HAS_SO_ERROR,1) + AC_MSG_RESULT(yes) + ;; *) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - #include - #include - #include ]], - [int i=SO_ERROR;])], - [AC_DEFINE(PJ_HAS_SO_ERROR,1) - AC_MSG_RESULT(yes)], - AC_MSG_RESULT(no)) - ;; + AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include + #include + #include + #include ]], + [int i=SO_ERROR;]) + ], + [ + AC_DEFINE(PJ_HAS_SO_ERROR,1) + AC_MSG_RESULT(yes) + ], + [AC_MSG_RESULT(no)] + ) + ;; esac dnl # Determine if RW-mutex is available AC_MSG_CHECKING([if pthread_rwlock_t is available]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], - [pthread_rwlock_t *x;])], - [AC_DEFINE(PJ_EMULATE_RWMUTEX,0) - ac_rwmutex="yes" - AC_MSG_RESULT(yes)], - [AC_DEFINE(PJ_EMULATE_RWMUTEX,1) - ac_rwmutex="no" - AC_MSG_RESULT(no)]) +AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([#include ],[pthread_rwlock_t *x;]) + ], + [ + AC_DEFINE(PJ_EMULATE_RWMUTEX,0) + ac_rwmutex="yes" + AC_MSG_RESULT(yes) + ], + [ + AC_DEFINE(PJ_EMULATE_RWMUTEX,1) + ac_rwmutex="no" + AC_MSG_RESULT(no) + ] +) dnl # If rwmutex is not detected, check again but this time dnl # with _POSIX_READER_WRITER_LOCKS defined (newlib needs this) if test "$ac_rwmutex" = "no"; then AC_MSG_CHECKING([if pthread_rwlock_t is available with _POSIX_READER_WRITER_LOCKS]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _POSIX_READER_WRITER_LOCKS - #include ]], - [pthread_rwlock_t *x;])], - [AC_DEFINE(PJ_EMULATE_RWMUTEX,0) - CFLAGS="$CFLAGS -D_POSIX_THREADS -D_POSIX_READER_WRITER_LOCKS" - AC_MSG_RESULT(yes)], - [AC_DEFINE(PJ_EMULATE_RWMUTEX,1) - AC_MSG_RESULT(no)]) + AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([ + [#define _POSIX_READER_WRITER_LOCKS + #include ]], + [pthread_rwlock_t *x;]) + ], + [ + AC_DEFINE(PJ_EMULATE_RWMUTEX,0) + CFLAGS="$CFLAGS -D_POSIX_THREADS -D_POSIX_READER_WRITER_LOCKS" + AC_MSG_RESULT(yes) + ], + [ + AC_DEFINE(PJ_EMULATE_RWMUTEX,1) + AC_MSG_RESULT(no) + ] + ) fi dnl # Do we have pthread_mutexattr_settype()? AC_MSG_CHECKING([if pthread_mutexattr_settype() is available]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], - [pthread_mutexattr_settype(0,PTHREAD_MUTEX_FAST_NP);])], - [AC_DEFINE(PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE,1) - AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no)]) +AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM( + [#include ], + [pthread_mutexattr_settype(0,PTHREAD_MUTEX_FAST_NP);]) + ], + [ + AC_DEFINE(PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE,1) + AC_MSG_RESULT(yes) + ], + [AC_MSG_RESULT(no)] +) dnl # Does pthread_mutexattr_t has "recursive" member? AC_MSG_CHECKING([if pthread_mutexattr_t has recursive member]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], - [[pthread_mutexattr_t attr; - attr.recursive=1;]])], - [AC_DEFINE(PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE,1) - AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no)]) +AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM( + [#include ], + [pthread_mutexattr_t attr; attr.recursive=1;]) + ], + [ + AC_DEFINE(PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE,1) + AC_MSG_RESULT(yes) + ], + [AC_MSG_RESULT(no)] +) dnl ###################### dnl # ioqueue selection -dnl # +dnl # AC_SUBST(ac_os_objs) AC_SUBST(ac_linux_poll) AC_MSG_CHECKING([ioqueue backend]) @@ -471,132 +576,135 @@ ac_os_objs=ioqueue_select.o ac_linux_poll=select case $target in - *darwin* | *bsd*) - AC_ARG_ENABLE(kqueue, - AS_HELP_STRING([--enable-kqueue], - [Use kqueue ioqueue on macos/BSD (experimental)]), - [ - if test "$enable_kqueue" = "yes"; then - ac_os_objs=ioqueue_kqueue.o - AC_MSG_RESULT([kqueue()]) - else - AC_MSG_RESULT([select()]) - fi - ], - [ - AC_MSG_RESULT([select()]) - ]) - ;; - *) - AC_ARG_ENABLE(epoll, - AS_HELP_STRING([--enable-epoll], - [Use /dev/epoll ioqueue on Linux (experimental)]), - [ - if test "$enable_epoll" = "yes"; then - ac_os_objs=ioqueue_epoll.o - AC_MSG_RESULT([/dev/epoll]) - AC_DEFINE(PJ_HAS_LINUX_EPOLL,1) - ac_linux_poll=epoll - else - AC_MSG_RESULT([select()]) - fi - ], - [ - AC_MSG_RESULT([select()]) - ]) - ;; + *darwin* | *bsd*) + AC_ARG_ENABLE(kqueue, + AS_HELP_STRING([--enable-kqueue], [Use kqueue ioqueue on macos/BSD (experimental)]), + [ + if test "$enable_kqueue" = "yes"; then + ac_os_objs=ioqueue_kqueue.o + AC_MSG_RESULT([kqueue()]) + else + AC_MSG_RESULT([select()]) + fi + ], + [ + AC_MSG_RESULT([select()]) + ] + ) + ;; + *) + AC_ARG_ENABLE(epoll, + AS_HELP_STRING([--enable-epoll], [Use /dev/epoll ioqueue on Linux (experimental)]), + [ + if test "$enable_epoll" = "yes"; then + ac_os_objs=ioqueue_epoll.o + AC_MSG_RESULT([/dev/epoll]) + AC_DEFINE(PJ_HAS_LINUX_EPOLL,1) + ac_linux_poll=epoll + else + AC_MSG_RESULT([select()]) + fi + ], + [ + AC_MSG_RESULT([select()]) + ] + ) + ;; esac AC_SUBST(ac_shared_libraries) AC_ARG_ENABLE(shared, - AS_HELP_STRING([--enable-shared], - [Build shared libraries]), - [if test "$enable_shared" = "yes"; then - [ac_shared_libraries=1] - CFLAGS="$CFLAGS -fPIC" - AC_MSG_RESULT([Building shared libraries... yes]) - fi], - AC_MSG_RESULT([Building shared libraries... no]) - ) + AS_HELP_STRING([--enable-shared], [Build shared libraries]), + [ + if test "$enable_shared" = "yes"; then + [ac_shared_libraries=1] + CFLAGS="$CFLAGS -fPIC" + AC_MSG_RESULT([Building shared libraries... yes]) + fi + ], + AC_MSG_RESULT([Building shared libraries... no]) +) AC_SUBST(ac_no_pjsua2) AC_ARG_ENABLE(pjsua2, - AS_HELP_STRING([--disable-pjsua2], - [Exclude pjsua2 library and application from the build]), - [if test "$enable_pjsua2" = "no"; then - [ac_no_pjsua2=1] - AC_MSG_RESULT([Building pjsua2 library and application... no]) - fi], - AC_MSG_RESULT([Building pjsua2 library and application... yes]) - ) + AS_HELP_STRING([--disable-pjsua2], [Exclude pjsua2 library and application from the build]), + [ + if test "$enable_pjsua2" = "no"; then + [ac_no_pjsua2=1] + AC_MSG_RESULT([Building pjsua2 library and application... no]) + fi + ], + AC_MSG_RESULT([Building pjsua2 library and application... yes]) +) dnl ###################### dnl # OS specific files dnl # case $target in - *mingw* | *cygw* | *win32* | *w32* ) - ac_os_objs="$ac_os_objs file_access_win32.o file_io_win32.o os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o sock_qos_bsd.o unicode_win32.o stack_win32.o" - ;; - *) - ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o stack.o" - case $target in - *-apple-darwin_ios*) - ac_os_objs="$ac_os_objs os_info_iphone.o os_core_darwin.o" - ;; - *darwin*) - ac_os_objs="$ac_os_objs os_core_darwin.o" - ;; - esac - # QoS - case $target in - *darwin*) - ac_os_objs="$ac_os_objs sock_qos_darwin.o sock_qos_bsd.o" - ;; - *) - ac_os_objs="$ac_os_objs sock_qos_bsd.o" - ;; - esac - # SSL - case $target in - *darwin*) - ac_os_objs="$ac_os_objs ssl_sock_apple.o" - ;; - esac - # UUID - case $target in - *android*) - ac_os_objs="$ac_os_objs guid_android.o" - ;; - *darwin*) - ac_os_objs="$ac_os_objs guid_darwin.o" - ;; - *bsd*) - ac_os_objs="$ac_os_objs guid_bsd.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 - ;; + *mingw* | *cygw* | *win32* | *w32* ) + ac_os_objs="$ac_os_objs file_access_win32.o file_io_win32.o os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o sock_qos_bsd.o unicode_win32.o" + ;; + *) + ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o" + case $target in + *-apple-darwin_ios*) + ac_os_objs="$ac_os_objs os_info_iphone.o os_core_darwin.o" + ;; + *darwin*) + ac_os_objs="$ac_os_objs os_core_darwin.o" + ;; + esac + + # QoS + case $target in + *darwin*) + ac_os_objs="$ac_os_objs sock_qos_darwin.o sock_qos_bsd.o" + ;; + *) + ac_os_objs="$ac_os_objs sock_qos_bsd.o" + ;; + esac + + # SSL + case $target in + *darwin*) + ac_os_objs="$ac_os_objs ssl_sock_apple.o" + ;; + esac + + # UUID + case $target in + *android*) + ac_os_objs="$ac_os_objs guid_android.o" + ;; + *darwin*) + ac_os_objs="$ac_os_objs guid_darwin.o" + ;; + *bsd*) + ac_os_objs="$ac_os_objs guid_bsd.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 dnl ########################################## dnl # PJLIB-UTIL dnl # - dnl # UPnP alt prefix AC_ARG_WITH(upnp, - AS_HELP_STRING([--with-upnp=DIR], - [Specify alternate libupnp prefix]), - [], - [with_upnp=no] - ) + AS_HELP_STRING([--with-upnp=DIR], [Specify alternate libupnp prefix]), + [], + [with_upnp=no] +) dnl # Do not use default libupnp installation if we are cross-compiling if test "x$ac_cross_compile" != "x" -a "x$with_upnp" = "xno"; then @@ -605,51 +713,55 @@ fi dnl # UPnP AC_ARG_ENABLE(upnp, - AS_HELP_STRING([--disable-upnp], - [Disable UPnP (default: not disabled)]), - [ - if test "$enable_upnp" = "no"; then - AC_MSG_RESULT([Checking if UPnP is disabled... yes]) - fi - ], - [ - if test "x$with_upnp" != "xno" -a "x$with_upnp" != "x"; then - UPNP_PREFIX=$with_upnp - UPNP_CFLAGS="-I$UPNP_PREFIX/upnp/inc -I$UPNP_PREFIX/ixml/inc" - UPNP_LDFLAGS="-L$UPNP_PREFIX/upnp/.libs -L$UPNP_PREFIX/imxl/.libs" - AC_MSG_RESULT([Using UPnP prefix... $with_upnp]) - else - UPNP_CFLAGS="" - UPNP_LDFLAGS="" - fi - - AC_MSG_CHECKING([UPnP usability]) - - UPNP_LIBS="-lupnp -lixml" - - SAVED_LIBS="$LIBS" - SAVED_LDFLAGS="$LDFLAGS" - SAVED_CFLAGS="$CFLAGS" - - LIBS="$UPNP_LIBS $LIBS" - LDFLAGS="$UPNP_LDFLAGS $LDFLAGS" - CFLAGS="$UPNP_CFLAGS $CFLAGS" - - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], - [UpnpInit2(NULL, 0);] - )], - [ CFLAGS="$CFLAGS -DPJNATH_HAS_UPNP=1 $UPNP_CFLAGS" - LDFLAGS="$LDFLAGS $UPNP_LDFLAGS $UPNP_LIBS" - AC_MSG_RESULT(yes) - ], - [ - LIBS="$SAVED_LIBS" - LDFLAGS="$SAVED_LDFLAGS" - CFLAGS="$SAVED_CFLAGS" - AC_MSG_RESULT(no) - ]) - - ]) + AS_HELP_STRING([--disable-upnp], [Disable UPnP (default: not disabled)]), + [ + if test "$enable_upnp" = "no"; then + AC_MSG_RESULT([Checking if UPnP is disabled... yes]) + fi + ], + [ + if test "x$with_upnp" != "xno" -a "x$with_upnp" != "x"; then + UPNP_PREFIX=$with_upnp + UPNP_CFLAGS="-I$UPNP_PREFIX/upnp/inc -I$UPNP_PREFIX/ixml/inc" + UPNP_LDFLAGS="-L$UPNP_PREFIX/upnp/.libs -L$UPNP_PREFIX/imxl/.libs" + AC_MSG_RESULT([Using UPnP prefix... $with_upnp]) + else + UPNP_CFLAGS="" + UPNP_LDFLAGS="" + fi + + AC_MSG_CHECKING([UPnP usability]) + + UPNP_LIBS="-lupnp -lixml" + + SAVED_LIBS="$LIBS" + SAVED_LDFLAGS="$LDFLAGS" + SAVED_CFLAGS="$CFLAGS" + + LIBS="$UPNP_LIBS $LIBS" + LDFLAGS="$UPNP_LDFLAGS $LDFLAGS" + CFLAGS="$UPNP_CFLAGS $CFLAGS" + + AC_LINK_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include ]], + [UpnpInit2(NULL, 0);]) + ], + [ + CFLAGS="$CFLAGS -DPJNATH_HAS_UPNP=1 $UPNP_CFLAGS" + LDFLAGS="$LDFLAGS $UPNP_LDFLAGS $UPNP_LIBS" + AC_MSG_RESULT(yes) + ], + [ + LIBS="$SAVED_LIBS" + LDFLAGS="$SAVED_LDFLAGS" + CFLAGS="$SAVED_CFLAGS" + AC_MSG_RESULT(no) + ] + ) + ] +) dnl ########################################## dnl # @@ -660,58 +772,73 @@ dnl # Use external Speex installation AC_SUBST(ac_external_speex,0) AC_ARG_WITH(external-speex, AS_HELP_STRING([--with-external-speex], - [Use external Speex development files, not the one in "third_party" directory. When this option is set, make sure that Speex is accessible to use (hint: use CFLAGS and LDFLAGS env var to set the include/lib paths)]), - [ - if test "x$with_external_speex" != "xno"; then - # Test Speex installation - AC_MSG_CHECKING([if external Speex devkit is installed]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - #include - ]], - [speex_echo_state_init(0, 0); speex_encoder_init(0); ])], - [AC_MSG_RESULT(yes!!) - AC_DEFINE(PJMEDIA_EXTERNAL_SPEEX_CODEC, 1) - ac_external_speex="1" - ], - [AC_MSG_ERROR([Unable to use external Speex library. If Speex development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths])]) - fi + [Use external Speex development files, not the one in "third_party" directory. When this option is set, make sure that Speex is accessible to use (hint: use CFLAGS and LDFLAGS env var to set the include/lib paths)]), + [ + if test "x$with_external_speex" != "xno"; then + # Test Speex installation + AC_MSG_CHECKING([if external Speex devkit is installed]) + AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include + #include ]], + [speex_echo_state_init(0, 0); speex_encoder_init(0); ]) + ], + [ + AC_MSG_RESULT(yes!!) + AC_DEFINE(PJMEDIA_EXTERNAL_SPEEX_CODEC, 1) + ac_external_speex="1" + ], + [ + AC_MSG_ERROR([Unable to use external Speex library. If Speex development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths]) + ] + ) + fi ] - ) +) dnl # Use external GSM codec library installation AC_SUBST(ac_external_gsm,0) AC_ARG_WITH(external-gsm, AS_HELP_STRING([--with-external-gsm], - [Use external GSM codec library, not the one in "third_party" directory. When this option is set, make sure that the GSM include/lib files are accessible to use (hint: use CFLAGS and LDFLAGS env var to set the include/lib paths)]), + [Use external GSM codec library, not the one in "third_party" directory. When this option is set, make sure that the GSM include/lib files are accessible to use (hint: use CFLAGS and LDFLAGS env var to set the include/lib paths)]), [ - if test "x$with_external_gsm" != "xno"; then - # Test GSM library installation - AC_MSG_CHECKING([if external GSM devkit is installed as gsm/gsm.h]) - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[#include ]], [gsm_create(); ]) ], - [AC_MSG_RESULT(yes!!) - AC_DEFINE(PJMEDIA_EXTERNAL_GSM_CODEC, 1) - AC_DEFINE(PJMEDIA_EXTERNAL_GSM_GSM_H, 1) - ac_external_gsm="1" - ], - [ - AC_MSG_RESULT(no) - AC_MSG_CHECKING([if external GSM devkit is installed as gsm.h]) - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[#include ]], [gsm_create(); ]) ], - [AC_MSG_RESULT(yes!!) - AC_DEFINE(PJMEDIA_EXTERNAL_GSM_CODEC, 1) - AC_DEFINE(PJMEDIA_EXTERNAL_GSM_H, 1) - ac_external_gsm="1" + if test "x$with_external_gsm" != "xno"; then + # Test GSM library installation + AC_MSG_CHECKING([if external GSM devkit is installed as gsm/gsm.h]) + AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([[#include ]], [gsm_create(); ]) + ], + [ + AC_MSG_RESULT(yes!!) + AC_DEFINE(PJMEDIA_EXTERNAL_GSM_CODEC, 1) + AC_DEFINE(PJMEDIA_EXTERNAL_GSM_GSM_H, 1) + ac_external_gsm="1" + ], + [ + AC_MSG_RESULT(no) + AC_MSG_CHECKING([if external GSM devkit is installed as gsm.h]) + AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include ]], [gsm_create(); ]) + ], + [ + AC_MSG_RESULT(yes!!) + AC_DEFINE(PJMEDIA_EXTERNAL_GSM_CODEC, 1) + AC_DEFINE(PJMEDIA_EXTERNAL_GSM_H, 1) + ac_external_gsm="1" ], - [AC_MSG_ERROR([Unable to use external GSM library. If GSM development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths]) + [ + AC_MSG_ERROR([Unable to use external GSM library. If GSM development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths]) ] ) - ] - ) - fi + ] + ) + fi ] - ) +) dnl # Use external SRTP installation @@ -719,632 +846,718 @@ AC_SUBST(ac_external_srtp,0) AC_SUBST(ac_external_srtp_lib) AC_ARG_WITH(external-srtp, AS_HELP_STRING([--with-external-srtp], - [Use external SRTP development files, not the one in "third_party" directory. When this option is set, make sure that SRTP is accessible to use (hint: use CFLAGS and LDFLAGS env var to set the include/lib paths)]), - [ - if test "x$with_external_srtp" != "xno"; then - # Test SRTP installation - AC_MSG_CHECKING([if external SRTP devkit is installed]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - ]], - [srtp_init();])], - [AC_MSG_RESULT(yes: version 2.x) - ac_external_srtp="2" - ac_external_srtp_lib="srtp2" - ], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - ]], - [srtp_init();])], - [AC_MSG_RESULT(yes: version 1.x) - ac_external_srtp="1" - ac_external_srtp_lib="srtp" - ], - [AC_MSG_ERROR([Unable to use SRTP. If SRTP development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths])])]) - fi + [Use external SRTP development files, not the one in "third_party" directory. When this option is set, make sure that SRTP is accessible to use (hint: use CFLAGS and LDFLAGS env var to set the include/lib paths)]), + [ + if test "x$with_external_srtp" != "xno"; then + # Test SRTP installation + AC_MSG_CHECKING([if external SRTP devkit is installed]) + AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include ]], + [srtp_init();]) + ], + [ + AC_MSG_RESULT(yes: version 2.x) + ac_external_srtp="2" + ac_external_srtp_lib="srtp2" + ], + [ + AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include ]], + [srtp_init();]) + ], + [ + AC_MSG_RESULT(yes: version 1.x) + ac_external_srtp="1" + ac_external_srtp_lib="srtp" + ], + [ + AC_MSG_ERROR([Unable to use SRTP. If SRTP development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths]) + ] + ) + ] + ) + fi ] - ) +) dnl # For external SRTP, check availability of srtp_deinit() or srtp_shutdown() if test "x$ac_external_srtp" != "x0"; then - AC_SUBST(ac_srtp_deinit_present,0) - AC_SUBST(ac_srtp_shutdown_present,0) - AC_CHECK_LIB($ac_external_srtp_lib,srtp_deinit,[ac_srtp_deinit_present=1]) - if test "x$ac_srtp_deinit_present" != "x1"; then - AC_CHECK_LIB($ac_external_srtp_lib,srtp_shutdown,[ac_srtp_shutdown_present=1]) - fi + AC_SUBST(ac_srtp_deinit_present,0) + AC_SUBST(ac_srtp_shutdown_present,0) + AC_CHECK_LIB($ac_external_srtp_lib,srtp_deinit,[ac_srtp_deinit_present=1]) + if test "x$ac_srtp_deinit_present" != "x1"; then + AC_CHECK_LIB($ac_external_srtp_lib,srtp_shutdown,[ac_srtp_shutdown_present=1]) + fi fi - dnl # Use external libyuv installation AC_SUBST(ac_external_yuv,0) AC_ARG_WITH(external-yuv, AS_HELP_STRING([--with-external-yuv], - [Use external libyuv development files, not the one in "third_party" directory. When this option is set, make sure that libyuv is accessible to use (hint: use CFLAGS and LDFLAGS env var to set the include/lib paths)]), - [ - if test "x$with_external_yuv" != "xno"; then - # Test libyuv installation - AC_MSG_CHECKING([if external libyuv devkit is installed]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], - [RGB24ToI420(0,0,0,0,0,0,0,0,0,0);])], - [AC_MSG_RESULT(yes!!) - ac_external_yuv="1" - ], - [AC_MSG_ERROR([Unable to use external libyuv. If libyuv development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths])]) - fi + [Use external libyuv development files, not the one in "third_party" directory. When this option is set, make sure that libyuv is accessible to use (hint: use CFLAGS and LDFLAGS env var to set the include/lib paths)]), + [ + if test "x$with_external_yuv" != "xno"; then + # Test libyuv installation + AC_MSG_CHECKING([if external libyuv devkit is installed]) + AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include ]], + [RGB24ToI420(0,0,0,0,0,0,0,0,0,0);]) + ], + [ + AC_MSG_RESULT(yes!!) + ac_external_yuv="1" + ], + [ + AC_MSG_ERROR([Unable to use external libyuv. If libyuv development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths]) + ] + ) + fi ] - ) +) dnl # Use external webrtc installation AC_SUBST(ac_external_webrtc,0) AC_ARG_WITH(external-webrtc, AS_HELP_STRING([--with-external-webrtc], - [Use external webrtc development files, not the one in "third_party" directory. When this option is set, make sure that webrtc is accessible to use (hint: use CFLAGS and LDFLAGS env var to set the include/lib paths)]), - [ - if test "x$with_external_webrtc" != "xno"; then - # Test webrtc installation - AC_MSG_CHECKING([if external webrtc devkit is installed]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - #include - ]], - [WebRtcAec_Create();])], - [AC_MSG_RESULT(yes!!) - ac_external_webrtc="1" - ], - [AC_MSG_ERROR([Unable to use external webrtc. If webrtc development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths])]) - fi + [Use external webrtc development files, not the one in "third_party" directory. When this option is set, make sure that webrtc is accessible to use (hint: use CFLAGS and LDFLAGS env var to set the include/lib paths)]), + [ + if test "x$with_external_webrtc" != "xno"; then + # Test webrtc installation + AC_MSG_CHECKING([if external webrtc devkit is installed]) + AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include + #include ]], + [WebRtcAec_Create();]) + ], + [ + AC_MSG_RESULT(yes!!) + ac_external_webrtc="1" + ], + [ + AC_MSG_ERROR([Unable to use external webrtc. If webrtc development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths]) + ] + ) + fi ] - ) +) dnl # Use external webrtc AEC3 installation AC_SUBST(ac_external_webrtc_aec3,0) AC_ARG_WITH(external-webrtc-aec3, AS_HELP_STRING([--with-external-webrtc-aec3], - [Use external webrtc AEC3 development files, not the one in "third_party" directory. When this option is set, make sure that webrtc is accessible to use (hint: use CFLAGS and LDFLAGS env var to set the include/lib paths)]), - [ - if test "x$with_external_webrtc_aec3" != "xno"; then - # Test webrtc AEC3 installation - AC_MSG_CHECKING([if external webrtc AEC3 is installed]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "modules/audio_processing/aec3/echo_canceller3.h" - ]], - [EchoCanceller3 ec(EchoCanceller3Config(), 16000, 1, 1);])], - [AC_MSG_RESULT(yes!!) - ac_external_webrtc_aec3="1" - ], - [AC_MSG_ERROR([Unable to use external webrtc AEC3. If webrtc development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths])]) - fi + [Use external webrtc AEC3 development files, not the one in "third_party" directory. When this option is set, make sure that webrtc is accessible to use (hint: use CFLAGS and LDFLAGS env var to set the include/lib paths)]), + [ + if test "x$with_external_webrtc_aec3" != "xno"; then + # Test webrtc AEC3 installation + AC_MSG_CHECKING([if external webrtc AEC3 is installed]) + AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include "modules/audio_processing/aec3/echo_canceller3.h"]], + [EchoCanceller3 ec(EchoCanceller3Config(), 16000, 1, 1);]) + ], + [ + AC_MSG_RESULT(yes!!) + ac_external_webrtc_aec3="1" + ], + [ + AC_MSG_ERROR([Unable to use external webrtc AEC3. If webrtc development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths]) + ] + ) + fi ] - ) +) dnl # Resample implementation AC_SUBST(ac_pjmedia_resample,libresample) AC_ARG_ENABLE(resample, - AS_HELP_STRING([--disable-resample], - [Disable resampling implementations]), - [if test "$enable_resample" = "no"; then - [ac_pjmedia_resample=none] - AC_MSG_RESULT([Checking if resampling is disabled...yes]) - fi] - ) + AS_HELP_STRING([--disable-resample], [Disable resampling implementations]), + [ + if test "$enable_resample" = "no"; then + [ac_pjmedia_resample=none] + AC_MSG_RESULT([Checking if resampling is disabled...yes]) + fi + ] +) dnl # Sound device backend selection AC_SUBST(ac_pjmedia_snd) AC_ARG_ENABLE(sound, - AS_HELP_STRING([--disable-sound], - [Exclude sound (i.e. use null sound)]), - [if test "$enable_sound" = "no"; then - [ac_pjmedia_snd=null] - AC_MSG_RESULT([Checking if sound is disabled... yes]) - fi] - ) + AS_HELP_STRING([--disable-sound], [Exclude sound (i.e. use null sound)]), + [ + if test "$enable_sound" = "no"; then + [ac_pjmedia_snd=null] + AC_MSG_RESULT([Checking if sound is disabled... yes]) + fi + ] +) dnl # Use external PortAudio installation AC_SUBST(ac_external_pa,0) AC_ARG_WITH(external-pa, AS_HELP_STRING([--with-external-pa], - [Use external PortAudio development files. When this option is set, make sure that PortAudio is accessible to use (hint: use CFLAGS and LDFLAGS env var to set the include/lib paths)]), - [ - if test "x$with_external_pa" != "xno"; then - # Test PortAudio installation - AC_MSG_CHECKING([if external PortAudio devkit is installed]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - ]], - [Pa_Initialize();])], - [AC_MSG_RESULT(yes!!) - ac_external_pa="1" - ], - [AC_MSG_ERROR([Unable to use PortAudio. If PortAudio development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths])]) - fi + [Use external PortAudio development files. When this option is set, make sure that PortAudio is accessible to use (hint: use CFLAGS and LDFLAGS env var to set the include/lib paths)]), + [ + if test "x$with_external_pa" != "xno"; then + # Test PortAudio installation + AC_MSG_CHECKING([if external PortAudio devkit is installed]) + AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include ]], + [Pa_Initialize();]) + ], + [ + AC_MSG_RESULT(yes!!) + ac_external_pa="1" + ], + [ + AC_MSG_ERROR([Unable to use PortAudio. If PortAudio development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths]) + ] + ) + fi ] - ) +) AC_SUBST(ac_pa_cflags) -AC_CHECK_HEADER(sys/soundcard.h, - [ac_pa_cflags="$ac_pa_cflags -DHAVE_SYS_SOUNDCARD_H"]) -AC_CHECK_HEADER(linux/soundcard.h, - [ac_pa_cflags="$ac_pa_cflags -DHAVE_LINUX_SOUNDCARD_H"]) -AC_CHECK_HEADER(machine/soundcard.h, - [ac_pa_cflags="$ac_pa_cflags -DHAVE_MACHINE_SOUNDCARD_H"]) +AC_CHECK_HEADER(sys/soundcard.h, [ac_pa_cflags="$ac_pa_cflags -DHAVE_SYS_SOUNDCARD_H"]) +AC_CHECK_HEADER(linux/soundcard.h, [ac_pa_cflags="$ac_pa_cflags -DHAVE_LINUX_SOUNDCARD_H"]) +AC_CHECK_HEADER(machine/soundcard.h, [ac_pa_cflags="$ac_pa_cflags -DHAVE_MACHINE_SOUNDCARD_H"]) if test "x$ac_cv_c_bigendian" = "xyes"; then - ac_pa_cflags="$ac_pa_cflags -DPA_BIG_ENDIAN" + ac_pa_cflags="$ac_pa_cflags -DPA_BIG_ENDIAN" else - ac_pa_cflags="$ac_pa_cflags -DPA_LITTLE_ENDIAN" + ac_pa_cflags="$ac_pa_cflags -DPA_LITTLE_ENDIAN" fi - dnl # Enable Android Oboe audio device AC_SUBST(ac_oboe_cflags) AC_SUBST(ac_oboe_ldflags) AC_ARG_WITH(oboe, - AS_HELP_STRING([--with-oboe], - [Enable Android Oboe audio device backend.]), - [ - if test "x$with_oboe" != "xno" -a "x$with_oboe" != "x"; then - OBOE_PREFIX=$with_oboe - OBOE_CFLAGS="-I$OBOE_PREFIX/prefab/modules/oboe/include" - OBOE_LDFLAGS="-L$OBOE_PREFIX/prefab/modules/oboe/libs/android.$TARGET_ABI" - AC_MSG_RESULT([Using Oboe prefix... $with_oboe]) - else - OBOE_CFLAGS="" - OBOE_LDFLAGS="" - fi - - AC_MSG_CHECKING([Oboe usability]) - - OBOE_LIBS="-loboe -lOpenSLES -llog" - - SAVED_LIBS="$LIBS" - SAVED_LDFLAGS="$LDFLAGS" - SAVED_CXXFLAGS="$CXXFLAGS" - - LIBS="$OBOE_LIBS $LIBS" - LDFLAGS="$OBOE_LDFLAGS $LDFLAGS" - CXXFLAGS="$OBOE_CFLAGS $CXXFLAGS" - - AC_LANG_PUSH([C++]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], - [oboe::AudioStreamBuilder sb; sb.setDeviceId(0);] - )], - [ ac_oboe_cflags="-DPJMEDIA_AUDIO_DEV_HAS_OBOE=1 $OBOE_CFLAGS" - ac_oboe_ldflags="$OBOE_LDFLAGS $OBOE_LIBS" - AC_MSG_RESULT(yes) - ], - [ - LIBS="$SAVED_LIBS" - LDFLAGS="$SAVED_LDFLAGS" - AC_MSG_RESULT(no) - ]) - AC_LANG_POP([C++]) - - # Put back original CXXFLAGS as app won't needed it. - CXXFLAGS="$SAVED_CFLAGS" + AS_HELP_STRING([--with-oboe], [Enable Android Oboe audio device backend.]), + [ + if test "x$with_oboe" != "xno" -a "x$with_oboe" != "x"; then + OBOE_PREFIX=$with_oboe + OBOE_CFLAGS="-I$OBOE_PREFIX/prefab/modules/oboe/include" + OBOE_LDFLAGS="-L$OBOE_PREFIX/prefab/modules/oboe/libs/android.$TARGET_ABI" + AC_MSG_RESULT([Using Oboe prefix... $with_oboe]) + else + OBOE_CFLAGS="" + OBOE_LDFLAGS="" + fi + + AC_MSG_CHECKING([Oboe usability]) + + OBOE_LIBS="-loboe -lOpenSLES -llog" + + SAVED_LIBS="$LIBS" + SAVED_LDFLAGS="$LDFLAGS" + SAVED_CXXFLAGS="$CXXFLAGS" + + LIBS="$OBOE_LIBS $LIBS" + LDFLAGS="$OBOE_LDFLAGS $LDFLAGS" + CXXFLAGS="$OBOE_CFLAGS $CXXFLAGS" + + AC_LANG_PUSH([C++]) + AC_LINK_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include ]], + [oboe::AudioStreamBuilder sb; sb.setDeviceId(0);]) + ], + [ + ac_oboe_cflags="-DPJMEDIA_AUDIO_DEV_HAS_OBOE=1 $OBOE_CFLAGS" + ac_oboe_ldflags="$OBOE_LDFLAGS $OBOE_LIBS" + AC_MSG_RESULT(yes) + ], + [ + LIBS="$SAVED_LIBS" + LDFLAGS="$SAVED_LDFLAGS" + AC_MSG_RESULT(no) + ] + ) + AC_LANG_POP([C++]) + + # Put back original CXXFLAGS as app won't needed it. + CXXFLAGS="$SAVED_CFLAGS" ] - ) +) if test "$enable_sound" = "no"; then - true; + true; else - AC_SUBST(ac_pjmedia_audiodev_objs) - case $target in - *android*) - if test "x$ac_oboe_cflags" != "x"; then - AC_MSG_RESULT([Checking sound device backend... Oboe]) - else - LIBS="$LIBS -lOpenSLES" - AC_MSG_RESULT([Checking sound device backend... Android]) - fi - ;; - *-apple-darwin_ios*) - LIBS="$LIBS -framework CoreAudio -framework CoreFoundation -framework AudioToolbox -framework CFNetwork -framework UIKit -framework AVFoundation" - ac_pjmedia_audiodev_objs="coreaudio_dev.o" - AC_MSG_RESULT([Checking sound device backend... AudioUnit]) - ;; - *darwin*) - LIBS="$LIBS -framework CoreAudio -framework CoreServices -framework AudioUnit -framework AudioToolbox" - ac_pjmedia_audiodev_objs="coreaudio_dev.o" - if test "`uname -r`" = "6.8"; then - #ac_pa_cflags="$ac_pa_cflags -DPA_OLD_CORE_AUDIO -DMOSX_USE_NON_ATOMIC_FLAG_BITS" - #AC_MSG_RESULT([Setting additional PortAudio CFLAGS.. -DPA_OLD_CORE_AUDIO -DMOSX_USE_NON_ATOMIC_FLAG_BITS]) - #ac_pjmedia_snd=pa_old_darwinos - AC_MSG_RESULT([Checking sound device backend... old coreaudio]) - else - ac_pjmedia_snd=coreaudio - AC_MSG_RESULT([Checking sound device backend... coreaudio]) - fi - ;; - *cygwin* | *mingw*) - ac_pjmedia_snd=win32 - AC_MSG_RESULT([Checking sound device backend... win32 sound]) - ;; - *rtems*) - ac_pjmedia_snd=null - AC_MSG_RESULT([Checking sound device backend... null sound]) - ;; - *) - if test "x$ac_external_pa" != "x1"; then - dnl # Check if ALSA is available - AC_CHECK_HEADER(alsa/version.h, - [LIBS="$LIBS -lasound" - ac_pjmedia_snd=alsa]) - if test "x$ac_pjmedia_snd" = "xalsa"; then - AC_MSG_RESULT([Checking sound device backend... alsa]) - else - ac_pjmedia_snd=null - AC_MSG_RESULT([Checking sound device backend... null sound]) - fi - fi - ;; - esac + AC_SUBST(ac_pjmedia_audiodev_objs) + case $target in + *android*) + if test "x$ac_oboe_cflags" != "x"; then + AC_MSG_RESULT([Checking sound device backend... Oboe]) + else + LIBS="$LIBS -lOpenSLES" + AC_MSG_RESULT([Checking sound device backend... Android]) + fi + ;; + *-apple-darwin_ios*) + LIBS="$LIBS -framework CoreAudio -framework CoreFoundation -framework AudioToolbox -framework CFNetwork -framework UIKit -framework AVFoundation" + ac_pjmedia_audiodev_objs="coreaudio_dev.o" + AC_MSG_RESULT([Checking sound device backend... AudioUnit]) + ;; + *darwin*) + LIBS="$LIBS -framework CoreAudio -framework CoreServices -framework AudioUnit -framework AudioToolbox" + ac_pjmedia_audiodev_objs="coreaudio_dev.o" + if test "`uname -r`" = "6.8"; then + #ac_pa_cflags="$ac_pa_cflags -DPA_OLD_CORE_AUDIO -DMOSX_USE_NON_ATOMIC_FLAG_BITS" + #AC_MSG_RESULT([Setting additional PortAudio CFLAGS.. -DPA_OLD_CORE_AUDIO -DMOSX_USE_NON_ATOMIC_FLAG_BITS]) + #ac_pjmedia_snd=pa_old_darwinos + AC_MSG_RESULT([Checking sound device backend... old coreaudio]) + else + ac_pjmedia_snd=coreaudio + AC_MSG_RESULT([Checking sound device backend... coreaudio]) + fi + ;; + *cygwin* | *mingw*) + ac_pjmedia_snd=win32 + AC_MSG_RESULT([Checking sound device backend... win32 sound]) + ;; + *rtems*) + ac_pjmedia_snd=null + AC_MSG_RESULT([Checking sound device backend... null sound]) + ;; + *) + if test "x$ac_external_pa" != "x1"; then + dnl # Check if ALSA is available + AC_CHECK_HEADER(alsa/version.h, + [LIBS="$LIBS -lasound" + ac_pjmedia_snd=alsa]) + if test "x$ac_pjmedia_snd" = "xalsa"; then + AC_MSG_RESULT([Checking sound device backend... alsa]) + else + ac_pjmedia_snd=null + AC_MSG_RESULT([Checking sound device backend... null sound]) + fi + fi + ;; + esac fi AC_SUBST(ac_pjmedia_video) # Disable video on mingw by default (but respect --enable-video=yes) case $target in - *mingw*) - if test ! "$enable_video" = "yes"; then - enable_video="no" - fi - ;; + *mingw*) + if test ! "$enable_video" = "yes"; then + enable_video="no" + fi + ;; esac dnl # --disable-video option AC_ARG_ENABLE(video, - AS_HELP_STRING([--disable-video], - [Disable video feature]), - [if test "$enable_video" = "no"; then - #AC_DEFINE(PJMEDIA_HAS_VIDEO,0) - AC_MSG_RESULT([Video is disabled]) - enable_sdl="no" - enable_ffmpeg="no" - enable_v4l2="no" - enable_openh264="no" - enable_libyuv="no" - enable_vpx="no" - fi], - []) + AS_HELP_STRING([--disable-video], [Disable video feature]), + [ + if test "$enable_video" = "no"; then + #AC_DEFINE(PJMEDIA_HAS_VIDEO,0) + AC_MSG_RESULT([Video is disabled]) + enable_sdl="no" + enable_ffmpeg="no" + enable_v4l2="no" + enable_openh264="no" + enable_libyuv="no" + enable_vpx="no" + fi + ], + [] +) case $target in - *android*) - LIBS="$LIBS -llog" - ;; - *-apple-darwin_ios*) - LIBS="$LIBS -framework UIKit" - ;; - *darwin*) - LIBS="$LIBS -framework Foundation -framework AppKit" - ;; + *android*) + LIBS="$LIBS -llog" + ;; + *-apple-darwin_ios*) + LIBS="$LIBS -framework UIKit" + ;; + *darwin*) + LIBS="$LIBS -framework Foundation -framework AppKit" + ;; esac if test "$enable_video" = "no"; then - true; + true; else - case $target in - *android*) - ac_pjmedia_video=android_os - AC_SUBST(ac_pjmedia_video_has_android) - AC_SUBST(ac_android_cflags) - SAVED_LIBS="$LIBS" - LIBS="-lGLESv2 -lEGL -landroid -lc" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [])],[ac_pjmedia_video_has_android=yes],[ac_pjmedia_video_has_android=no]) - LIBS="$SAVED_LIBS" - if test "$ac_pjmedia_video_has_android" = "yes"; then - ac_android_cflags="-DPJMEDIA_VIDEO_DEV_HAS_ANDROID_OPENGL=1" - LIBS="$LIBS -lGLESv2 -lEGL -landroid" - AC_MSG_RESULT([Checking if OpenGL ES 2 is available... yes]) - else - AC_MSG_RESULT([Checking if OpenGL ES 2 is available... no]) - fi - ac_android_cflags="$ac_android_cflags -DPJMEDIA_VIDEO_DEV_HAS_ANDROID=1" - ;; - *mingw*) - if test "$enable_video" = "yes"; then - ac_pjmedia_video=windows_os - AC_SUBST(ac_pjmedia_video_dev_has_dshow) - ac_pjmedia_video_dev_has_dshow=yes - AC_SUBST(ac_dshow_cflags) - ac_dshow_cflags="-DPJMEDIA_HAS_VIDEO=1 -DPJMEDIA_VIDEO_DEV_HAS_DSHOW=1" - AC_SUBST(ac_dshow_ldflags) - ac_dshow_ldflags=" -lstdc++ -lquartz -lole32 -loleaut32 -lrpcrt4 -lwinmm -luuid -lmingwex -lstrmiids " - LIBS="$LIBS -lstdc++ -lquartz -lole32 -loleaut32 -lrpcrt4 -lwinmm -luuid -lmingwex -lstrmiids " - fi - ;; - *darwin*) - ac_pjmedia_video=darwin_os - AC_SUBST(ac_pjmedia_video_has_darwin) - AC_SUBST(ac_pjmedia_video_has_metal) - AC_SUBST(ac_pjmedia_video_has_vtoolbox) - AC_SUBST(ac_pjmedia_video_has_ios_opengl) - AC_SUBST(ac_darwin_cflags) - SAVED_LIBS="$LIBS" - LIBS="-framework AVFoundation -framework CoreGraphics -framework QuartzCore -framework CoreVideo -framework CoreMedia" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [])], - [ac_pjmedia_video_has_darwin=yes], - [ac_pjmedia_video_has_darwin=no]) - LIBS="-framework VideoToolbox" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [])], - [ac_pjmedia_video_has_vtoolbox=yes], - [ac_pjmedia_video_has_vtoolbox=no]) - LIBS="-framework Metal" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [])], - [ac_pjmedia_video_has_metal=yes], - [ac_pjmedia_video_has_metal=no]) - LIBS="-framework OpenGLES" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [])], - [ac_pjmedia_video_has_ios_opengl=yes], - [ac_pjmedia_video_has_ios_opengl=no]) - LIBS="$SAVED_LIBS" - if test "$ac_pjmedia_video_has_darwin" = "yes"; then - ac_darwin_cflags="-DPJMEDIA_VIDEO_DEV_HAS_DARWIN=1" - LIBS="$LIBS -framework AVFoundation -framework CoreGraphics -framework QuartzCore -framework CoreVideo -framework CoreMedia" - AC_MSG_RESULT([Checking if AVFoundation framework is available... yes]) - else - AC_MSG_RESULT([Checking if AVFoundation framework is available... no]) - fi - if test "$ac_pjmedia_video_has_metal" = "yes"; then - ac_darwin_cflags+=" -DPJMEDIA_VIDEO_DEV_HAS_METAL=1" - LIBS="$LIBS -framework Metal -framework MetalKit" - AC_MSG_RESULT([Checking if Metal framework is available... yes]) - else - AC_MSG_RESULT([Checking if Metal framework is available... no]) - fi - if test "$ac_pjmedia_video_has_vtoolbox" = "yes"; then - #ac_darwin_cflags+=" -DPJMEDIA_HAS_VID_TOOLBOX_CODEC=1" - LIBS="$LIBS -framework VideoToolbox" - AC_MSG_RESULT([Checking if VideoToolbox framework is available... yes]) - else - AC_MSG_RESULT([Checking if VideoToolbox framework is available... no]) - fi - if test "$ac_pjmedia_video_has_ios_opengl" = "yes"; then - ac_darwin_cflags+=" -DPJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL=1" - LIBS="$LIBS -framework OpenGLES" - AC_MSG_RESULT([Checking if OpenGLES framework is available... yes]) - else - AC_MSG_RESULT([Checking if OpenGLES framework is available... no]) - fi - if false; then - # QTKit is deprecated, see ticket #1931. - ac_pjmedia_video=mac_os - AC_SUBST(ac_pjmedia_video_has_qt) - AC_SUBST(ac_qt_cflags) - SAVED_LIBS="$LIBS" - LIBS="-framework QTKit" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [])],[ac_pjmedia_video_has_qt=yes],[ac_pjmedia_video_has_qt=no]) - LIBS="$SAVED_LIBS" - if test "$ac_pjmedia_video_has_qt" = "yes"; then - ac_qt_cflags="-DPJMEDIA_VIDEO_DEV_HAS_QT=1" - LIBS="$LIBS -framework QTKit -framework QuartzCore -framework OpenGL" - AC_MSG_RESULT([Checking if QTKit framework is available... yes]) - else - AC_MSG_RESULT([Checking if QTKit framework is available... no]) - fi - fi - ;; - esac + case $target in + *android*) + ac_pjmedia_video=android_os + AC_SUBST(ac_pjmedia_video_has_android) + AC_SUBST(ac_android_cflags) + SAVED_LIBS="$LIBS" + LIBS="-lGLESv2 -lEGL -landroid -lc" + AC_LINK_IFELSE( + [ + AC_LANG_PROGRAM([[]], []) + ], + [ac_pjmedia_video_has_android=yes], + [ac_pjmedia_video_has_android=no] + ) + LIBS="$SAVED_LIBS" + if test "$ac_pjmedia_video_has_android" = "yes"; then + ac_android_cflags="-DPJMEDIA_VIDEO_DEV_HAS_ANDROID_OPENGL=1" + LIBS="$LIBS -lGLESv2 -lEGL -landroid" + AC_MSG_RESULT([Checking if OpenGL ES 2 is available... yes]) + else + AC_MSG_RESULT([Checking if OpenGL ES 2 is available... no]) + fi + ac_android_cflags="$ac_android_cflags -DPJMEDIA_VIDEO_DEV_HAS_ANDROID=1" + ;; + *mingw*) + if test "$enable_video" = "yes"; then + ac_pjmedia_video=windows_os + AC_SUBST(ac_pjmedia_video_dev_has_dshow) + ac_pjmedia_video_dev_has_dshow=yes + AC_SUBST(ac_dshow_cflags) + ac_dshow_cflags="-DPJMEDIA_HAS_VIDEO=1 -DPJMEDIA_VIDEO_DEV_HAS_DSHOW=1" + AC_SUBST(ac_dshow_ldflags) + ac_dshow_ldflags=" -lstdc++ -lquartz -lole32 -loleaut32 -lrpcrt4 -lwinmm -luuid -lmingwex -lstrmiids " + LIBS="$LIBS -lstdc++ -lquartz -lole32 -loleaut32 -lrpcrt4 -lwinmm -luuid -lmingwex -lstrmiids " + fi + ;; + *darwin*) + ac_pjmedia_video=darwin_os + AC_SUBST(ac_pjmedia_video_has_darwin) + AC_SUBST(ac_pjmedia_video_has_metal) + AC_SUBST(ac_pjmedia_video_has_vtoolbox) + AC_SUBST(ac_pjmedia_video_has_ios_opengl) + AC_SUBST(ac_darwin_cflags) + SAVED_LIBS="$LIBS" + + LIBS="-framework AVFoundation -framework CoreGraphics -framework QuartzCore -framework CoreVideo -framework CoreMedia" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[]], [])], + [ac_pjmedia_video_has_darwin=yes], + [ac_pjmedia_video_has_darwin=no] + ) + + LIBS="-framework VideoToolbox" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[]], [])], + [ac_pjmedia_video_has_vtoolbox=yes], + [ac_pjmedia_video_has_vtoolbox=no]) + + LIBS="-framework Metal" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[]], [])], + [ac_pjmedia_video_has_metal=yes], + [ac_pjmedia_video_has_metal=no]) + + LIBS="-framework OpenGLES" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[]], [])], + [ac_pjmedia_video_has_ios_opengl=yes], + [ac_pjmedia_video_has_ios_opengl=no]) + + LIBS="$SAVED_LIBS" + if test "$ac_pjmedia_video_has_darwin" = "yes"; then + ac_darwin_cflags="-DPJMEDIA_VIDEO_DEV_HAS_DARWIN=1" + LIBS="$LIBS -framework AVFoundation -framework CoreGraphics -framework QuartzCore -framework CoreVideo -framework CoreMedia" + AC_MSG_RESULT([Checking if AVFoundation framework is available... yes]) + else + AC_MSG_RESULT([Checking if AVFoundation framework is available... no]) + fi + + if test "$ac_pjmedia_video_has_metal" = "yes"; then + ac_darwin_cflags+=" -DPJMEDIA_VIDEO_DEV_HAS_METAL=1" + LIBS="$LIBS -framework Metal -framework MetalKit" + AC_MSG_RESULT([Checking if Metal framework is available... yes]) + else + AC_MSG_RESULT([Checking if Metal framework is available... no]) + fi + + if test "$ac_pjmedia_video_has_vtoolbox" = "yes"; then + #ac_darwin_cflags+=" -DPJMEDIA_HAS_VID_TOOLBOX_CODEC=1" + LIBS="$LIBS -framework VideoToolbox" + AC_MSG_RESULT([Checking if VideoToolbox framework is available... yes]) + else + AC_MSG_RESULT([Checking if VideoToolbox framework is available... no]) + fi + + if test "$ac_pjmedia_video_has_ios_opengl" = "yes"; then + ac_darwin_cflags+=" -DPJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL=1" + LIBS="$LIBS -framework OpenGLES" + AC_MSG_RESULT([Checking if OpenGLES framework is available... yes]) + else + AC_MSG_RESULT([Checking if OpenGLES framework is available... no]) + fi + + if false; then + # QTKit is deprecated, see ticket #1931. + ac_pjmedia_video=mac_os + AC_SUBST(ac_pjmedia_video_has_qt) + AC_SUBST(ac_qt_cflags) + SAVED_LIBS="$LIBS" + LIBS="-framework QTKit" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [])],[ac_pjmedia_video_has_qt=yes],[ac_pjmedia_video_has_qt=no]) + LIBS="$SAVED_LIBS" + if test "$ac_pjmedia_video_has_qt" = "yes"; then + ac_qt_cflags="-DPJMEDIA_VIDEO_DEV_HAS_QT=1" + LIBS="$LIBS -framework QTKit -framework QuartzCore -framework OpenGL" + AC_MSG_RESULT([Checking if QTKit framework is available... yes]) + else + AC_MSG_RESULT([Checking if QTKit framework is available... no]) + fi + fi + ;; + esac fi AC_ARG_ENABLE(ext_sound, - AS_HELP_STRING([--enable-ext-sound], - [PJMEDIA will not provide any sound device backend]), - [if test "$enable_ext_sound" = "yes"; then - [ac_pjmedia_snd=external] - AC_MSG_RESULT([Checking if external sound is set... yes]) - fi] - ) + AS_HELP_STRING([--enable-ext-sound], [PJMEDIA will not provide any sound device backend]), + [ + if test "$enable_ext_sound" = "yes"; then + [ac_pjmedia_snd=external] + AC_MSG_RESULT([Checking if external sound is set... yes]) + fi + ] +) dnl # Include resampling small filter AC_SUBST(ac_no_small_filter) AC_ARG_ENABLE(small-filter, - AS_HELP_STRING([--disable-small-filter], - [Exclude small filter in resampling]), - [if test "$enable_small_filter" = "no"; then - [ac_no_small_filter='-DPJMEDIA_HAS_SMALL_FILTER=0'] - AC_MSG_RESULT([Checking if small filter is disabled... yes]) - fi], - AC_MSG_RESULT([Checking if small filter is disabled... no])) + AS_HELP_STRING([--disable-small-filter], [Exclude small filter in resampling]), + [ + if test "$enable_small_filter" = "no"; then + [ac_no_small_filter='-DPJMEDIA_HAS_SMALL_FILTER=0'] + AC_MSG_RESULT([Checking if small filter is disabled... yes]) + fi + ], + AC_MSG_RESULT([Checking if small filter is disabled... no]) +) dnl # Include resampling large filter AC_SUBST(ac_no_large_filter) AC_ARG_ENABLE(large-filter, - AS_HELP_STRING([--disable-large-filter], - [Exclude large filter in resampling]), - [if test "$enable_large_filter" = "no"; then - [ac_no_large_filter='-DPJMEDIA_HAS_LARGE_FILTER=0'] - AC_MSG_RESULT([Checking if large filter is disabled... yes]) - fi], - AC_MSG_RESULT([Checking if large filter is disabled... no])) + AS_HELP_STRING([--disable-large-filter],[Exclude large filter in resampling]), + [ + if test "$enable_large_filter" = "no"; then + [ac_no_large_filter='-DPJMEDIA_HAS_LARGE_FILTER=0'] + AC_MSG_RESULT([Checking if large filter is disabled... yes]) + fi + ], + AC_MSG_RESULT([Checking if large filter is disabled... no]) +) dnl # Include Speex AEC AC_SUBST(ac_no_speex_aec) AC_ARG_ENABLE(speex-aec, - AS_HELP_STRING([--disable-speex-aec], - [Exclude Speex Acoustic Echo Canceller/AEC]), - [if test "$enable_speex_aec" = "no"; then - [ac_no_speex_aec='-DPJMEDIA_HAS_SPEEX_AEC=0'] - AC_MSG_RESULT([Checking if Speex AEC is disabled...yes]) - fi], - AC_MSG_RESULT([Checking if Speex AEC is disabled...no])) + AS_HELP_STRING([--disable-speex-aec], [Exclude Speex Acoustic Echo Canceller/AEC]), + [ + if test "$enable_speex_aec" = "no"; then + [ac_no_speex_aec='-DPJMEDIA_HAS_SPEEX_AEC=0'] + AC_MSG_RESULT([Checking if Speex AEC is disabled...yes]) + fi + ], + AC_MSG_RESULT([Checking if Speex AEC is disabled...no]) +) dnl # Include G711 codec AC_SUBST(ac_no_g711_codec) AC_ARG_ENABLE(g711-codec, - AS_HELP_STRING([--disable-g711-codec], - [Exclude G.711 codecs from the build]), - [if test "$enable_g711_codec" = "no"; then - [ac_no_g711_codec=1] - AC_DEFINE(PJMEDIA_HAS_G711_CODEC,0) - AC_MSG_RESULT([Checking if G.711 codec is disabled...yes]) - fi], - AC_MSG_RESULT([Checking if G.711 codec is disabled...no])) + AS_HELP_STRING([--disable-g711-codec], [Exclude G.711 codecs from the build]), + [ + if test "$enable_g711_codec" = "no"; then + [ac_no_g711_codec=1] + AC_DEFINE(PJMEDIA_HAS_G711_CODEC,0) + AC_MSG_RESULT([Checking if G.711 codec is disabled...yes]) + fi + ], + AC_MSG_RESULT([Checking if G.711 codec is disabled...no]) +) dnl # Include L16 codec AC_SUBST(ac_no_l16_codec) AC_ARG_ENABLE(l16-codec, - AS_HELP_STRING([--disable-l16-codec], - [Exclude Linear/L16 codec family from the build]), - [if test "$enable_l16_codec" = "no"; then - [ac_no_l16_codec=1] - AC_DEFINE(PJMEDIA_HAS_L16_CODEC,0) - AC_MSG_RESULT([Checking if L16 codecs are disabled...yes]) - fi], - AC_MSG_RESULT([Checking if L16 codec is disabled...no])) - + AS_HELP_STRING([--disable-l16-codec], [Exclude Linear/L16 codec family from the build]), + [ + if test "$enable_l16_codec" = "no"; then + [ac_no_l16_codec=1] + AC_DEFINE(PJMEDIA_HAS_L16_CODEC,0) + AC_MSG_RESULT([Checking if L16 codecs are disabled...yes]) + fi + ], + AC_MSG_RESULT([Checking if L16 codec is disabled...no]) +) dnl # Include GSM codec AC_SUBST(ac_no_gsm_codec) AC_ARG_ENABLE(gsm-codec, - AS_HELP_STRING([--disable-gsm-codec], - [Exclude GSM codec in the build]), - [if test "$enable_gsm_codec" = "no"; then - [ac_no_gsm_codec=1] - AC_DEFINE(PJMEDIA_HAS_GSM_CODEC,0) - AC_MSG_RESULT([Checking if GSM codec is disabled...yes]) - fi], - AC_MSG_RESULT([Checking if GSM codec is disabled...no])) + AS_HELP_STRING([--disable-gsm-codec], [Exclude GSM codec in the build]), + [ + if test "$enable_gsm_codec" = "no"; then + [ac_no_gsm_codec=1] + AC_DEFINE(PJMEDIA_HAS_GSM_CODEC,0) + AC_MSG_RESULT([Checking if GSM codec is disabled...yes]) + fi + ], + AC_MSG_RESULT([Checking if GSM codec is disabled...no]) +) dnl # Include G.722 codec AC_SUBST(ac_no_g722_codec) AC_ARG_ENABLE(g722-codec, - AS_HELP_STRING([--disable-g722-codec], - [Exclude G.722 codec in the build]), - [if test "$enable_g722_codec" = "no"; then - [ac_no_g722_codec=1] - AC_DEFINE(PJMEDIA_HAS_G722_CODEC,0) - AC_MSG_RESULT([Checking if G.722 codec is disabled...yes]) - fi], - AC_MSG_RESULT([Checking if G.722 codec is disabled...no])) + AS_HELP_STRING([--disable-g722-codec], [Exclude G.722 codec in the build]), + [ + if test "$enable_g722_codec" = "no"; then + [ac_no_g722_codec=1] + AC_DEFINE(PJMEDIA_HAS_G722_CODEC,0) + AC_MSG_RESULT([Checking if G.722 codec is disabled...yes]) + fi + ], + AC_MSG_RESULT([Checking if G.722 codec is disabled...no]) +) dnl # Include G722.1 codec AC_SUBST(ac_no_g7221_codec) AC_ARG_ENABLE(g7221-codec, - AS_HELP_STRING([--disable-g7221-codec], - [Exclude G.7221 codec in the build]), - [if test "$enable_g7221_codec" = "no"; then - [ac_no_g7221_codec=1] - AC_DEFINE(PJMEDIA_HAS_G7221_CODEC,0) - AC_MSG_RESULT([Checking if G.722.1 codec is disabled...yes]) - fi], - AC_MSG_RESULT([Checking if G.722.1 codec is disabled...no])) + AS_HELP_STRING([--disable-g7221-codec], [Exclude G.7221 codec in the build]), + [ + if test "$enable_g7221_codec" = "no"; then + [ac_no_g7221_codec=1] + AC_DEFINE(PJMEDIA_HAS_G7221_CODEC,0) + AC_MSG_RESULT([Checking if G.722.1 codec is disabled...yes]) + fi + ], + AC_MSG_RESULT([Checking if G.722.1 codec is disabled...no]) +) dnl # Include Speex codec AC_SUBST(ac_no_speex_codec) AC_ARG_ENABLE(speex-codec, - AS_HELP_STRING([--disable-speex-codec], - [Exclude Speex codecs in the build]), - [if test "$enable_speex_codec" = "no"; then - [ac_no_speex_codec=1] - AC_DEFINE(PJMEDIA_HAS_SPEEX_CODEC,0) - AC_MSG_RESULT([Checking if Speex codec is disabled...yes]) - fi], - AC_MSG_RESULT([Checking if Speex codec is disabled...no])) + AS_HELP_STRING([--disable-speex-codec], [Exclude Speex codecs in the build]), + [ + if test "$enable_speex_codec" = "no"; then + [ac_no_speex_codec=1] + AC_DEFINE(PJMEDIA_HAS_SPEEX_CODEC,0) + AC_MSG_RESULT([Checking if Speex codec is disabled...yes]) + fi + ], + AC_MSG_RESULT([Checking if Speex codec is disabled...no]) +) dnl # Include iLBC codec AC_SUBST(ac_no_ilbc_codec) AC_ARG_ENABLE(ilbc-codec, - AS_HELP_STRING([--disable-ilbc-codec], - [Exclude iLBC codec in the build]), - [if test "$enable_ilbc_codec" = "no"; then - [ac_no_ilbc_codec=1] - AC_DEFINE(PJMEDIA_HAS_ILBC_CODEC,0) - AC_MSG_RESULT([Checking if iLBC codec is disabled...yes]) - fi], - AC_MSG_RESULT([Checking if iLBC codec is disabled...no])) + AS_HELP_STRING([--disable-ilbc-codec], [Exclude iLBC codec in the build]), + [ + if test "$enable_ilbc_codec" = "no"; then + [ac_no_ilbc_codec=1] + AC_DEFINE(PJMEDIA_HAS_ILBC_CODEC,0) + AC_MSG_RESULT([Checking if iLBC codec is disabled...yes]) + fi + ], + AC_MSG_RESULT([Checking if iLBC codec is disabled...no]) +) dnl # Include libsamplerate AC_ARG_ENABLE(libsamplerate, - AS_HELP_STRING([--enable-libsamplerate], - [Link with libsamplerate when available.]), - [ - if test "$enable_libsamplerate" = "yes"; then - AC_MSG_RESULT([Checking if libsamplerate is enabled...yes]) - AC_CHECK_LIB(samplerate,src_new) - [ac_pjmedia_resample=libsamplerate] - else - AC_MSG_RESULT([Checking if libsamplerate is enabled...no]) - fi - ], AC_MSG_RESULT([Checking if libsamplerate is enabled...no])) + AS_HELP_STRING([--enable-libsamplerate], [Link with libsamplerate when available.]), + [ + if test "$enable_libsamplerate" = "yes"; then + AC_MSG_RESULT([Checking if libsamplerate is enabled...yes]) + AC_CHECK_LIB(samplerate,src_new) + [ac_pjmedia_resample=libsamplerate] + else + AC_MSG_RESULT([Checking if libsamplerate is enabled...no]) + fi + ], + AC_MSG_RESULT([Checking if libsamplerate is enabled...no]) +) AC_SUBST(ac_resample_dll) AC_ARG_ENABLE(resample_dll, - AS_HELP_STRING([--enable-resample-dll], - [Build libresample as shared library]), - [if test "$enable_resample_dll" = "yes"; then - [ac_resample_dll=1] - AC_MSG_RESULT([Building libresample as shared library... yes]) - fi], - AC_MSG_RESULT([Building libresample as shared library... no]) - ) + AS_HELP_STRING([--enable-resample-dll], [Build libresample as shared library]), + [ + if test "$enable_resample_dll" = "yes"; then + [ac_resample_dll=1] + AC_MSG_RESULT([Building libresample as shared library... yes]) + fi + ], + AC_MSG_RESULT([Building libresample as shared library... no]) +) dnl # Include Speex resample AC_ARG_ENABLE(speex-resample, - AS_HELP_STRING([--enable-speex-resample], - [Enable Speex resample]), - [ - if test "$enable_speex_resample" = "yes"; then - AC_MSG_RESULT([Checking if Speex resample is enabled... yes]) - [ac_pjmedia_resample=speex] - else - AC_MSG_RESULT([Checking if Speex resample is enabled... no]) - fi - ], AC_MSG_RESULT([Checking if Speex resample is enabled... no])) + AS_HELP_STRING([--enable-speex-resample], [Enable Speex resample]), + [ + if test "$enable_speex_resample" = "yes"; then + AC_MSG_RESULT([Checking if Speex resample is enabled... yes]) + [ac_pjmedia_resample=speex] + else + AC_MSG_RESULT([Checking if Speex resample is enabled... no]) + fi + ], + AC_MSG_RESULT([Checking if Speex resample is enabled... no]) +) dnl # SDL alt prefix AC_ARG_WITH(sdl, - AS_HELP_STRING([--with-sdl=DIR], - [Specify alternate libSDL prefix]), + AS_HELP_STRING([--with-sdl=DIR], [Specify alternate libSDL prefix]), [], [with_sdl=no] - ) +) dnl # Do not use default SDL installation if we are cross-compiling if test "x$ac_cross_compile" != "x" -a "x$with_sdl" = "xno"; then - enable_sdl=no + nable_sdl=no fi dnl # SDL AC_ARG_ENABLE(sdl, - AS_HELP_STRING([--disable-sdl], - [Disable SDL (default: not disabled)]), - [ - if test "$enable_sdl" = "no"; then - AC_MSG_RESULT([Checking if SDL is disabled... yes]) - fi - ], - [ - if test "x$with_sdl" != "xno" -a "x$with_sdl" != "x"; then - AC_MSG_RESULT([Using SDL prefix... $with_sdl]) - AC_PATH_PROGS(SDL_CONFIG,sdl2-config sdl-config,,$with_sdl/bin) - else - AC_PATH_PROGS(SDL_CONFIG, sdl2-config sdl-config) - fi - - AC_MSG_CHECKING([SDL availability]) - if test "x$SDL_CONFIG" = "x"; then - AC_MSG_RESULT([not found]) - elif (sh -c "$SDL_CONFIG --version" | grep -e '^1\.3' -e '^2\.') then - AC_SUBST(ac_sdl_cflags) - AC_SUBST(ac_sdl_ldflags) - ac_sdl_cflags=`$SDL_CONFIG --cflags` - ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags" - ac_sdl_ldflags=`$SDL_CONFIG --libs` - ac_sdl_ldflags=`echo "${ac_sdl_ldflags}" | sed -e 's/-mwindows//g'` - LIBS="$LIBS $ac_sdl_ldflags" - else - AC_MSG_RESULT([Unsupported SDL version]) - fi - ]) - + AS_HELP_STRING([--disable-sdl], [Disable SDL (default: not disabled)]), + [ + if test "$enable_sdl" = "no"; then + AC_MSG_RESULT([Checking if SDL is disabled... yes]) + fi + ], + [ + if test "x$with_sdl" != "xyes" -a "x$with_sdl" != "xno" -a "x$with_sdl" != "x"; then + AC_MSG_RESULT([Using SDL prefix... $with_sdl]) + AC_PATH_PROGS(SDL_CONFIG,sdl2-config sdl-config,,$with_sdl/bin) + else + AC_PATH_PROGS(SDL_CONFIG, sdl2-config sdl-config) + fi + + AC_MSG_CHECKING([SDL availability]) + if test "x$SDL_CONFIG" = "x"; then + AC_MSG_RESULT([not found]) + elif (sh -c "$SDL_CONFIG --version" | grep -e '^1\.3' -e '^2\.') then + AC_SUBST(ac_sdl_cflags) + AC_SUBST(ac_sdl_ldflags) + ac_sdl_cflags=`$SDL_CONFIG --cflags` + ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags" + ac_sdl_ldflags=`$SDL_CONFIG --libs` + ac_sdl_ldflags=`echo "${ac_sdl_ldflags}" | sed -e 's/-mwindows//g'` + LIBS="$LIBS $ac_sdl_ldflags" + else + AC_MSG_RESULT([Unsupported SDL version]) + fi + ] +) AC_ARG_WITH(ffmpeg, - AS_HELP_STRING([--with-ffmpeg=DIR], - [Specify alternate FFMPEG prefix]), + AS_HELP_STRING([--with-ffmpeg=DIR], [Specify alternate FFMPEG prefix]), [], [with_ffmpeg=no] - ) +) dnl # Do not use default ffmpeg installation if we are cross-compiling if test "x$ac_cross_compile" != "x" -a "x$with_ffmpeg" = "xno"; then @@ -1353,157 +1566,131 @@ fi dnl # FFMPEG stuffs AC_ARG_ENABLE(ffmpeg, - AS_HELP_STRING([--disable-ffmpeg], - [Disable ffmpeg (default: not disabled)]), - [ - AC_SUBST(ac_has_ffmpeg,0) - if test "$enable_ffmpeg" = "no"; then - AC_MSG_RESULT([Checking if ffmpeg is disabled... yes]) - fi - ], - [ - AC_SUBST(ac_ffmpeg_cflags) - AC_SUBST(ac_ffmpeg_ldflags) - - FFMPEG_PREFIX="" - AC_SUBST(SAVED_PKG_CONFIG_PATH) - SAVED_PKG_CONFIG_PATH=$PKG_CONFIG_PATH - if test "x$with_ffmpeg" != "xno" -a "x$with_ffmpeg" != "x"; then - FFMPEG_PREFIX=$with_ffmpeg - AC_MSG_RESULT([Using ffmpeg prefix... $FFMPEG_PREFIX]) - export PKG_CONFIG_PATH=$FFMPEG_PREFIX/lib/pkgconfig - fi - - AC_CHECK_PROGS(PKG_CONFIG,pkg-config "python pkgconfig.py",none) - - if test "$PKG_CONFIG" != "none"; then - AC_MSG_CHECKING([ffmpeg packages]) - av_pkg="" - if $PKG_CONFIG --exists libavdevice; then - ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVDEVICE=1" - av_pkg="$av_pkg libavdevice" - fi - if $PKG_CONFIG --exists libavformat; then - ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVFORMAT=1" - av_pkg="$av_pkg libavformat" - fi - if $PKG_CONFIG --exists libavcodec; then - ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVCODEC=1" - av_pkg="$av_pkg libavcodec" - fi - if $PKG_CONFIG --exists libswscale; then - ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBSWSCALE=1" - av_pkg="$av_pkg libswscale" - fi - if $PKG_CONFIG --exists libavutil; then - ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVUTIL=1" - av_pkg="$av_pkg libavutil" - fi - - if test "x$av_pkg" = "x"; then - AC_MSG_RESULT([none detected (check the prefix)! **]) - else - AC_MSG_RESULT([$av_pkg]) - fi - - ac_ffmpeg_cflags="$ac_ffmpeg_cflags `$PKG_CONFIG --cflags $av_pkg`" - ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags `$PKG_CONFIG --libs $av_pkg`" - - else - dnl # - dnl # Use hardcoded values to configure ffmpeg - dnl # - - AC_MSG_RESULT([*** Warning: neither pkg-config nor python is available, ffmpeg dependency cannot be calculated. If ffmpeg libraries are not detected, you need to specify the correct CFLAGS and LDFLAGS settings for ffmpeg prior to invoking configure ***]) - - LIBS="-L$FFMPEG_PREFIX/lib $LIBS" - LDFLAGS="-L$FFMPEG_PREFIX/lib $LDFLAGS" - CFLAGS="-I$FFMPEG_PREFIX/include $CFLAGS" - - AC_CHECK_LIB(avdevice, - avdevice_version, - [ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVDEVICE=1" - ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavdevice" - ] - ) - AC_CHECK_LIB(avutil, - av_malloc, - [ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVUTIL=1" - ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavutil" - ] - ) - AC_CHECK_LIB(avcodec, - avcodec_init, - [ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVCODEC=1" - ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavcodec" - ], - [], - [-lavutil] - ) - AC_CHECK_LIB(avformat, - av_register_all, - [ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVFORMAT=1" - ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavformat" - ], - [], - [-lavcodec -lavutil] - ) - AC_CHECK_LIB(swscale, - sws_scale, - [ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBSWSCALE=1" - ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lswscale" - ], - [], - [-lavutil] - ) - AC_CHECK_LIB(avcore, - avcore_version, - [ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVCORE=1" - ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavcore" - ] - ) - - fi - - AC_CHECK_TYPES(enum AVPixelFormat, - [], - [ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_USE_OLD_FFMPEG=1"], - [[#include ]] - ) - - LIBS="$LIBS $ac_ffmpeg_ldflags" - export PKG_CONFIG_PATH=$SAVED_PKG_CONFIG_PATH - ] - ) + AS_HELP_STRING([--disable-ffmpeg], [Disable ffmpeg (default: not disabled)]), + [ + AC_SUBST(ac_has_ffmpeg,0) + if test "$enable_ffmpeg" = "no"; then + AC_MSG_RESULT([Checking if ffmpeg is disabled... yes]) + fi + ], + [ + AC_SUBST(ac_ffmpeg_cflags) + AC_SUBST(ac_ffmpeg_ldflags) + + FFMPEG_PREFIX="" + AC_SUBST(SAVED_PKG_CONFIG_PATH) + SAVED_PKG_CONFIG_PATH=$PKG_CONFIG_PATH + if test "x$with_ffmpeg" != "xyes" -a "x$with_ffmpeg" != "xno" -a "x$with_ffmpeg" != "x"; then + FFMPEG_PREFIX=$with_ffmpeg + AC_MSG_RESULT([Using ffmpeg prefix... $FFMPEG_PREFIX]) + export PKG_CONFIG_PATH=$FFMPEG_PREFIX/lib/pkgconfig + fi + + if test "$PKG_CONFIG" != "none"; then + AC_MSG_CHECKING([ffmpeg packages]) + av_pkg="" + if $PKG_CONFIG --exists libavdevice; then + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVDEVICE=1" + av_pkg="$av_pkg libavdevice" + fi + if $PKG_CONFIG --exists libavformat; then + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVFORMAT=1" + av_pkg="$av_pkg libavformat" + fi + if $PKG_CONFIG --exists libavcodec; then + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVCODEC=1" + av_pkg="$av_pkg libavcodec" + fi + if $PKG_CONFIG --exists libswscale; then + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBSWSCALE=1" + av_pkg="$av_pkg libswscale" + fi + if $PKG_CONFIG --exists libavutil; then + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVUTIL=1" + av_pkg="$av_pkg libavutil" + fi + + if test "x$av_pkg" = "x"; then + AC_MSG_RESULT([none detected (check the prefix)! **]) + else + AC_MSG_RESULT([$av_pkg]) + fi + + ac_ffmpeg_cflags="$ac_ffmpeg_cflags `$PKG_CONFIG --cflags $av_pkg`" + ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags `$PKG_CONFIG --libs $av_pkg`" + + else + dnl # + dnl # Use hardcoded values to configure ffmpeg + dnl # + + AC_MSG_RESULT([*** Warning: neither pkg-config nor python is available, ffmpeg dependency cannot be calculated. If ffmpeg libraries are not detected, you need to specify the correct CFLAGS and LDFLAGS settings for ffmpeg prior to invoking configure ***]) + + LIBS="-L$FFMPEG_PREFIX/lib $LIBS" + LDFLAGS="-L$FFMPEG_PREFIX/lib $LDFLAGS" + CFLAGS="-I$FFMPEG_PREFIX/include $CFLAGS" + + AC_CHECK_LIB(avdevice, avdevice_version, [ + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVDEVICE=1" + ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavdevice"]) + + AC_CHECK_LIB(avutil, av_malloc, [ + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVUTIL=1" + ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavutil"]) + + AC_CHECK_LIB(avcodec, avcodec_init, [ + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVCODEC=1" + ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavcodec"], + [], [-lavutil]) + + AC_CHECK_LIB(avformat, av_register_all, [ + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVFORMAT=1" + ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavformat"], + [], [-lavcodec -lavutil]) + + AC_CHECK_LIB(swscale, sws_scale, [ + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBSWSCALE=1" + ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lswscale"], + [], [-lavutil]) + + AC_CHECK_LIB(avcore, avcore_version, [ + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVCORE=1" + ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavcore"]) + fi + + AC_CHECK_TYPES(enum AVPixelFormat,[],[ + ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_USE_OLD_FFMPEG=1"], + [[#include ]]) + + LIBS="$LIBS $ac_ffmpeg_ldflags" + export PKG_CONFIG_PATH=$SAVED_PKG_CONFIG_PATH + ] +) dnl # Video for Linux 2 AC_ARG_ENABLE(v4l2, - AS_HELP_STRING([--disable-v4l2], - [Disable Video4Linux2 (default: not disabled)]), - [ - if test "$enable_v4l2" = "no"; then - AC_MSG_RESULT([Checking if V4L2 is disabled... yes]) - fi - ], - [ - AC_SUBST(ac_v4l2_cflags) - AC_SUBST(ac_v4l2_ldflags) - AC_CHECK_LIB(v4l2, - v4l2_open, - [ac_v4l2_cflags="-DPJMEDIA_VIDEO_DEV_HAS_V4L2=1" - ac_v4l2_ldflags="-lv4l2" - LIBS="$LIBS -lv4l2" - ] - ) - ]) + AS_HELP_STRING([--disable-v4l2], [Disable Video4Linux2 (default: not disabled)]), + [ + if test "$enable_v4l2" = "no"; then + AC_MSG_RESULT([Checking if V4L2 is disabled... yes]) + fi + ], + [ + AC_SUBST(ac_v4l2_cflags) + AC_SUBST(ac_v4l2_ldflags) + AC_CHECK_LIB(v4l2, v4l2_open, [ + ac_v4l2_cflags="-DPJMEDIA_VIDEO_DEV_HAS_V4L2=1" + ac_v4l2_ldflags="-lv4l2" + LIBS="$LIBS -lv4l2"]) + ] +) dnl # OpenH264 alt prefix AC_ARG_WITH(openh264, - AS_HELP_STRING([--with-openh264=DIR], - [Specify alternate OpenH264 prefix]), - [], - [with_openh264=no] - ) + AS_HELP_STRING([--with-openh264=DIR], [Specify alternate OpenH264 prefix]), + [], + [with_openh264=no] +) dnl # Do not use default OpenH264 installation if we are cross-compiling if test "x$ac_cross_compile" != "x" -a "x$with_openh264" = "xno"; then @@ -1514,61 +1701,63 @@ dnl # OpenH264 AC_SUBST(ac_openh264_cflags) AC_SUBST(ac_openh264_ldflags) AC_ARG_ENABLE(openh264, - AS_HELP_STRING([--disable-openh264], - [Disable OpenH264 (default: not disabled)]), - [ - if test "$enable_openh264" = "no"; then - AC_MSG_RESULT([Checking if OpenH264 is disabled... yes]) - fi - ], - [ - if test "x$with_openh264" != "xno" -a "x$with_openh264" != "x"; then - OPENH264_PREFIX=$with_openh264 - OPENH264_CFLAGS="-I$OPENH264_PREFIX/include" - OPENH264_LDFLAGS="-L$OPENH264_PREFIX/lib" - AC_MSG_RESULT([Using OpenH264 prefix... $with_openh264]) - else - OPENH264_CFLAGS="" - OPENH264_LDFLAGS="" - fi - - AC_MSG_CHECKING([OpenH264 usability]) - - OPENH264_LIBS="-lopenh264 -lstdc++" - - SAVED_LIBS="$LIBS" - SAVED_LDFLAGS="$LDFLAGS" - SAVED_CFLAGS="$CFLAGS" - - LIBS="$OPENH264_LIBS $LIBS" - LDFLAGS="$OPENH264_LDFLAGS $LDFLAGS" - CFLAGS="$OPENH264_CFLAGS $CFLAGS" - - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include - #include - ]], - [WelsCreateSVCEncoder(0);] - )], - [ ac_openh264_cflags="-DPJMEDIA_HAS_OPENH264_CODEC=1 $OPENH264_CFLAGS" - ac_openh264_ldflags="$OPENH264_LDFLAGS $OPENH264_LIBS" - AC_MSG_RESULT(yes) - ], - [ - LIBS="$SAVED_LIBS" - LDFLAGS="$SAVED_LDFLAGS" - CFLAGS="$SAVED_CFLAGS" - AC_MSG_RESULT(no) - ]) - - ]) + AS_HELP_STRING([--disable-openh264], [Disable OpenH264 (default: not disabled)]), + [ + if test "$enable_openh264" = "no"; then + AC_MSG_RESULT([Checking if OpenH264 is disabled... yes]) + fi + ], + [ + if test "x$with_openh264" != "xno" -a "x$with_openh264" != "x"; then + OPENH264_PREFIX=$with_openh264 + OPENH264_CFLAGS="-I$OPENH264_PREFIX/include" + OPENH264_LDFLAGS="-L$OPENH264_PREFIX/lib" + AC_MSG_RESULT([Using OpenH264 prefix... $with_openh264]) + else + OPENH264_CFLAGS="" + OPENH264_LDFLAGS="" + fi + + AC_MSG_CHECKING([OpenH264 usability]) + + OPENH264_LIBS="-lopenh264 -lstdc++" + + SAVED_LIBS="$LIBS" + SAVED_LDFLAGS="$LDFLAGS" + SAVED_CFLAGS="$CFLAGS" + + LIBS="$OPENH264_LIBS $LIBS" + LDFLAGS="$OPENH264_LDFLAGS $LDFLAGS" + CFLAGS="$OPENH264_CFLAGS $CFLAGS" + + AC_LINK_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include + #include ]], + [WelsCreateSVCEncoder(0);]) + ], + [ + ac_openh264_cflags="-DPJMEDIA_HAS_OPENH264_CODEC=1 $OPENH264_CFLAGS" + ac_openh264_ldflags="$OPENH264_LDFLAGS $OPENH264_LIBS" + AC_MSG_RESULT(yes) + ], + [ + LIBS="$SAVED_LIBS" + LDFLAGS="$SAVED_LDFLAGS" + CFLAGS="$SAVED_CFLAGS" + AC_MSG_RESULT(no) + ] + ) + ] +) dnl # VPX alt prefix AC_ARG_WITH(vpx, - AS_HELP_STRING([--with-vpx=DIR], - [Specify alternate VPX prefix]), - [], - [with_vpx=no] - ) + AS_HELP_STRING([--with-vpx=DIR], [Specify alternate VPX prefix]), + [], + [with_vpx=no] +) dnl # Do not use default VPX installation if we are cross-compiling if test "x$ac_cross_compile" != "x" -a "x$with_vpx" = "xno"; then @@ -1579,276 +1768,282 @@ dnl # VPX AC_SUBST(ac_vpx_cflags) AC_SUBST(ac_vpx_ldflags) AC_ARG_ENABLE(vpx, - AS_HELP_STRING([--disable-vpx], - [Disable VPX (default: not disabled)]), - [ - if test "$enable_vpx" = "no"; then - AC_MSG_RESULT([Checking if VPX is disabled... yes]) - fi - ], - [ - if test "x$with_vpx" != "xno" -a "x$with_vpx" != "x"; then - VPX_PREFIX=$with_vpx - VPX_CFLAGS="-I$VPX_PREFIX/include" - VPX_LDFLAGS="-L$VPX_PREFIX/lib" - AC_MSG_RESULT([Using VPX prefix... $with_vpx]) - else - VPX_CFLAGS="" - VPX_LDFLAGS="" - fi - - AC_MSG_CHECKING([VPX usability]) - - VPX_LIBS="-lvpx" - - SAVED_LIBS="$LIBS" - SAVED_LDFLAGS="$LDFLAGS" - SAVED_CFLAGS="$CFLAGS" - - LIBS="$VPX_LIBS $LIBS" - LDFLAGS="$VPX_LDFLAGS $LDFLAGS" - CFLAGS="$VPX_CFLAGS $CFLAGS" - - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include - #include - ]], - [vpx_codec_iface_t *(*enc_if)() = &vpx_codec_vp8_cx;] - )], - [ ac_vpx_cflags="-DPJMEDIA_HAS_VPX_CODEC=1 $VPX_CFLAGS" - ac_vpx_ldflags="$VPX_LDFLAGS $VPX_LIBS" - AC_MSG_RESULT(yes) - ], - [ - LIBS="$SAVED_LIBS" - LDFLAGS="$SAVED_LDFLAGS" - CFLAGS="$SAVED_CFLAGS" - AC_MSG_RESULT(no) - ]) - - ]) - + AS_HELP_STRING([--disable-vpx], [Disable VPX (default: not disabled)]), + [ + if test "$enable_vpx" = "no"; then + AC_MSG_RESULT([Checking if VPX is disabled... yes]) + fi + ], + [ + if test "x$with_vpx" != "xno" -a "x$with_vpx" != "x"; then + VPX_PREFIX=$with_vpx + VPX_CFLAGS="-I$VPX_PREFIX/include" + VPX_LDFLAGS="-L$VPX_PREFIX/lib" + AC_MSG_RESULT([Using VPX prefix... $with_vpx]) + else + VPX_CFLAGS="" + VPX_LDFLAGS="" + fi + + AC_MSG_CHECKING([VPX usability]) + + VPX_LIBS="-lvpx" + + SAVED_LIBS="$LIBS" + SAVED_LDFLAGS="$LDFLAGS" + SAVED_CFLAGS="$CFLAGS" + + LIBS="$VPX_LIBS $LIBS" + LDFLAGS="$VPX_LDFLAGS $LDFLAGS" + CFLAGS="$VPX_CFLAGS $CFLAGS" + + AC_LINK_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include + #include ]], + [vpx_codec_iface_t *(*enc_if)() = &vpx_codec_vp8_cx;]) + ], + [ + ac_vpx_cflags="-DPJMEDIA_HAS_VPX_CODEC=1 $VPX_CFLAGS" + ac_vpx_ldflags="$VPX_LDFLAGS $VPX_LIBS" + AC_MSG_RESULT(yes) + ], + [ + LIBS="$SAVED_LIBS" + LDFLAGS="$SAVED_LDFLAGS" + CFLAGS="$SAVED_CFLAGS" + AC_MSG_RESULT(no) + ] + ) + ] +) dnl ######################################################## dnl # Intel IPP support dnl # AC_ARG_ENABLE(ipp, AS_HELP_STRING([--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 --with-ipp-samples options]), + [Enable Intel IPP support. Specify the Intel IPP package and samples location using IPPROOT and IPPSAMPLES env var or with --with-ipp and --with-ipp-samples options]), [], [enable_ipp=no] - ) +) AC_ARG_WITH(ipp, - AS_HELP_STRING([--with-ipp=DIR], - [Specify the Intel IPP location]), + AS_HELP_STRING([--with-ipp=DIR], [Specify the Intel IPP location]), [], [with_ipp=no] - ) +) AC_ARG_WITH(ipp-samples, - AS_HELP_STRING([--with-ipp-samples=DIR], - [Specify the Intel IPP samples location]), + AS_HELP_STRING([--with-ipp-samples=DIR], [Specify the Intel IPP samples location]), [], [with_ipp_samples=no] - ) +) AC_ARG_WITH(ipp-arch, AS_HELP_STRING([--with-ipp-arch=ARCH], - [Specify the Intel IPP ARCH suffix, e.g. "64" or "em64t. Default is blank for IA32"]), + [Specify the Intel IPP ARCH suffix, e.g. "64" or "em64t. Default is blank for IA32"]), [], [with_ipp_arch=no] - ) +) if test "x$enable_ipp" != "xno"; then - dnl # + dnl # dnl # Verifying Intel IPP path dnl # AC_MSG_CHECKING([Intel IPP location]) if test "x$with_ipp" != "xno" -a "x$with_ipp" != "x"; then - AC_MSG_RESULT([$with_ipp]) - IPPROOT=$with_ipp + AC_MSG_RESULT([$with_ipp]) + IPPROOT=$with_ipp elif test "x$IPPROOT" = "x"; then - if test -d /opt/intel/ipp; then - IPPROOT=`ls -d /opt/intel/ipp/*/* | head -1` - AC_MSG_RESULT([autodetected in $IPPROOT]) - fi + if test -d /opt/intel/ipp; then + IPPROOT=`ls -d /opt/intel/ipp/*/* | head -1` + AC_MSG_RESULT([autodetected in $IPPROOT]) + fi else - AC_MSG_RESULT([$IPPROOT]) + AC_MSG_RESULT([$IPPROOT]) fi if test "x$with_ipp_arch" != "xno"; then - IPP_SUFFIX=$with_ipp_arch - AC_MSG_RESULT([IPP arch suffix is set to $IPP_SUFFIX]) + IPP_SUFFIX=$with_ipp_arch + AC_MSG_RESULT([IPP arch suffix is set to $IPP_SUFFIX]) else - IPP_SUFFIX="" - AC_MSG_RESULT([IPP arch suffix is set to empty]) + IPP_SUFFIX="" + AC_MSG_RESULT([IPP arch suffix is set to empty]) fi if test x$IPPROOT = x; then - AC_MSG_ERROR([the location is neither specified nor can be guessed. Please specify with IPPROOT env var or with --with-ipp option]) + AC_MSG_ERROR([the location is neither specified nor can be guessed. Please specify with IPPROOT env var or with --with-ipp option]) elif test ! -d $IPPROOT; then - AC_MSG_ERROR([not found]) + AC_MSG_ERROR([not found]) elif test ! -d $IPPROOT/include; then - AC_MSG_ERROR([directory doesn't seem to be valid]) + AC_MSG_ERROR([directory doesn't seem to be valid]) else - # IPP directory looks okay. - # Remove trailing backslash - IPPROOT=`echo $IPPROOT | sed 's/\/$//'` - - SAVED_CFLAGS="$CFLAGS" - SAVED_LDFLAGS="$LDFLAGS" - SAVED_LIBS="$LIBS" - - IPP_CFLAGS="-I$IPPROOT/include" - IPP_LIBS="-lippsc${IPP_SUFFIX} -lipps${IPP_SUFFIX} -lippcore${IPP_SUFFIX}" - -# - # Some differences between Mac OS X and Linux - case $target in - *darwin* ) - IPP_LDFLAGS="-L$IPPROOT/Libraries -L$IPPROOT/lib" - ;; - *) - # Find out where the libraries live. - IPP7_ARCH="" - if test -d $IPPROOT/lib/intel64; then - IPP7_ARCH="intel64" - elif test -d $IPPROOT/lib/ia32; then - IPP7_ARCH="ia32" - elif test -d $IPPROOT/lib/mic; then - IPP7_ARCH="mic" - fi - - if test -z "$IPP7_ARCH"; then - # IPP6 (and possibly below) - IPP_LDFLAGS="-L$IPPROOT/sharedlib" - IPP_LIBS="$IPP_LIBS -lippsr${IPP_SUFFIX} -lguide" - else - # IPP7 - if ! test -d $IPPROOT/../compiler; then - AC_MSG_ERROR([Cannot find $IPPROOT/../compiler directory. Please set IPPROOT variable correctly]) - fi - IPP_CFLAGS="$IPP_CFLAGS" - IPP_LDFLAGS="-L$IPPROOT/lib/intel64 -L$IPPROOT/../compiler/lib/$IPP7_ARCH" - IPP_LIBS="$IPP_LIBS -liomp5" - fi - ;; - esac - - #IPP_LDFLAGS="-L$IPPROOT/sharedlib" - #Static: - #IPP_LIBS="-lippscmerged -lippsrmerged -lippsmerged -lippcore" - - CFLAGS="$CFLAGS $IPP_CFLAGS" - LDFLAGS="$LDFLAGS $IPP_LDFLAGS" - LIBS="$IPP_LIBS $LIBS" - - - AC_MSG_CHECKING([Intel IPP usability]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include - ]], - [ippStaticInit();])], - [AC_MSG_RESULT(yes)], - [AC_MSG_FAILURE([Error: unable to recognize your IPP installation. Make sure the paths and ARCH suffix are set correctly, run with --help for more info])]) - - CFLAGS="$SAVED_CFLAGS" - LDFLAGS="$SAVED_LDFLAGS" - LIBS="$SAVED_LIBS" + # IPP directory looks okay. + # Remove trailing backslash + IPPROOT=`echo $IPPROOT | sed 's/\/$//'` + + SAVED_CFLAGS="$CFLAGS" + SAVED_LDFLAGS="$LDFLAGS" + SAVED_LIBS="$LIBS" + + IPP_CFLAGS="-I$IPPROOT/include" + IPP_LIBS="-lippsc${IPP_SUFFIX} -lipps${IPP_SUFFIX} -lippcore${IPP_SUFFIX}" + + # Some differences between Mac OS X and Linux + case $target in + *darwin* ) + IPP_LDFLAGS="-L$IPPROOT/Libraries -L$IPPROOT/lib" + ;; + *) + # Find out where the libraries live. + IPP7_ARCH="" + if test -d $IPPROOT/lib/intel64; then + IPP7_ARCH="intel64" + elif test -d $IPPROOT/lib/ia32; then + IPP7_ARCH="ia32" + elif test -d $IPPROOT/lib/mic; then + IPP7_ARCH="mic" + fi + + if test -z "$IPP7_ARCH"; then + # IPP6 (and possibly below) + IPP_LDFLAGS="-L$IPPROOT/sharedlib" + IPP_LIBS="$IPP_LIBS -lippsr${IPP_SUFFIX} -lguide" + else + # IPP7 + if ! test -d $IPPROOT/../compiler; then + AC_MSG_ERROR([Cannot find $IPPROOT/../compiler directory. Please set IPPROOT variable correctly]) + fi + IPP_CFLAGS="$IPP_CFLAGS" + IPP_LDFLAGS="-L$IPPROOT/lib/intel64 -L$IPPROOT/../compiler/lib/$IPP7_ARCH" + IPP_LIBS="$IPP_LIBS -liomp5" + fi + ;; + esac + + #IPP_LDFLAGS="-L$IPPROOT/sharedlib" + #Static: + #IPP_LIBS="-lippscmerged -lippsrmerged -lippsmerged -lippcore" + + CFLAGS="$CFLAGS $IPP_CFLAGS" + LDFLAGS="$LDFLAGS $IPP_LDFLAGS" + LIBS="$IPP_LIBS $LIBS" + + AC_MSG_CHECKING([Intel IPP usability]) + AC_LINK_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include ]], + [ippStaticInit();]) + ], + [AC_MSG_RESULT(yes)], + [AC_MSG_FAILURE([Error: unable to recognize your IPP installation. Make sure the paths and ARCH suffix are set correctly, run with --help for more info])] + ) + + CFLAGS="$SAVED_CFLAGS" + LDFLAGS="$SAVED_LDFLAGS" + LIBS="$SAVED_LIBS" fi - dnl # + dnl # dnl # Verifying Intel IPP samples path dnl # AC_MSG_CHECKING([Intel IPP samples location]) if test "x$with_ipp_samples" != "xno" -a "x$with_ipp_samples" != "x"; then - AC_MSG_RESULT([$with_ipp_samples]) - IPPSAMPLES=$with_ipp_samples + AC_MSG_RESULT([$with_ipp_samples]) + IPPSAMPLES=$with_ipp_samples elif test "x$IPPSAMPLES" = "x"; then - if test -d /opt/intel/ipp-samples; then - IPPSAMPLES=/opt/intel/ipp-samples - AC_MSG_RESULT([autodetected in $IPPSAMPLES]) - fi + if test -d /opt/intel/ipp-samples; then + IPPSAMPLES=/opt/intel/ipp-samples + AC_MSG_RESULT([autodetected in $IPPSAMPLES]) + fi else - AC_MSG_RESULT([$IPPSAMPLES]) + AC_MSG_RESULT([$IPPSAMPLES]) fi if test x$IPPSAMPLES = x; then - AC_MSG_ERROR([the location is neither specified nor can be guessed. Please specify with IPPSAMPLES env var or with --with-ipp-samples option]) + AC_MSG_ERROR([the location is neither specified nor can be guessed. Please specify with IPPSAMPLES env var or with --with-ipp-samples option]) elif test ! -d $IPPSAMPLES; then - AC_MSG_ERROR([not found]) + AC_MSG_ERROR([not found]) elif test ! -d $IPPSAMPLES/speech-codecs; then - AC_MSG_ERROR([directory doesn't seem to be valid]) + AC_MSG_ERROR([directory doesn't seem to be valid]) else - # Remove trailing backslash - IPPSAMPLES=`echo $IPPSAMPLES | sed 's/\/$//'` - - # Guess the libusc.a/libspeech.a build location - AC_MSG_CHECKING([Intel IPP USC build location]) - if test -d $IPPSAMPLES/speech-codecs/bin; then - IPPVER=5 - IPPSAMP_DIR=`ls -d $IPPSAMPLES/speech-codecs/bin/*gcc*/lib | head -1` - elif test -d $IPPSAMPLES/speech-codecs/_bin; then - IPPVER=6 - if test -d $IPPSAMPLES/speech-codecs/_bin/*gcc*; then - # gcc compiler - IPPSAMP_DIR=`ls -d $IPPSAMPLES/speech-codecs/_bin/*gcc*/lib | head -1` - elif test -d $IPPSAMPLES/speech-codecs/_bin/*icc*; then - # icc compiler - IPPSAMP_DIR=`ls -d $IPPSAMPLES/speech-codecs/_bin/*icc*/lib | head -1` - else - AC_MSG_FAILURE([Unable to find to find built binaries under $IPPSAMPLES/speech-codecs/{bin,_bin}. Have you built the IPP samples?]) - fi - else - AC_MSG_FAILURE([unable to find $IPPSAMPLES/speech-codecs/bin/*gcc*/lib or $IPPSAMPLES/speech-codecs/_bin/*gcc*/lib directory. Have you built the samples?]) - fi - - # Test the directory - if test ! -d $IPPSAMP_DIR; then - AC_MSG_FAILURE([There's something wrong with this script, directory $IPPSAMP_DIR does not exist]) - exit 1; - fi - - if test "x$IPPVER" = "x5"; then - IPPSAMP_LIBS="libusc.a" - IPPSAMP_LDLIBS="-lusc" - elif test "x$IPPVER" = "x6"; then - IPPSAMP_LIBS="libspeech.a" - IPPSAMP_LDLIBS="-lspeech" - else - AC_MSG_FAILURE([bug in this script: unsupported IPP version]) - fi - - if test ! -f $IPPSAMP_DIR/$IPPSAMP_LIBS; then - AC_MSG_FAILURE([$IPPSAMP_LIBS doesn't exist in $IPPSAMP_DIR]) - fi - - AC_MSG_RESULT([$IPPSAMP_DIR]) - - SAVED_CFLAGS="$CFLAGS" - SAVED_LDFLAGS="$LDFLAGS" - SAVED_LIBS="$LIBS" - - IPPSAMP_INC="-I$IPPSAMPLES/speech-codecs/core/usc/include" - CFLAGS="$CFLAGS $IPPSAMP_INC" - LDFLAGS="$LDFLAGS -L$IPPSAMP_DIR" - LIBS="$IPPSAMP_LDLIBS $LIBS" - - AC_MSG_CHECKING([Intel IPP USC usability]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include - ]], - [extern USC_Fxns USC_G729AFP_Fxns;])], - [AC_MSG_RESULT(yes)], - [AC_MSG_FAILURE(no)]) - - CFLAGS="$SAVED_CFLAGS" - LDFLAGS="$IPP_LDFLAGS $SAVED_LDFLAGS" - LIBS="$IPP_LIBS $SAVED_LIBS" - - IPP_CFLAGS="$IPP_CFLAGS $IPPSAMP_INC" - IPP_LDFLAGS="$IPP_LDFLAGS -L$IPPSAMP_DIR" - IPP_LIBS="$IPPSAMP_LDLIBS $IPP_LIBS" + # Remove trailing backslash + IPPSAMPLES=`echo $IPPSAMPLES | sed 's/\/$//'` + + # Guess the libusc.a/libspeech.a build location + AC_MSG_CHECKING([Intel IPP USC build location]) + if test -d $IPPSAMPLES/speech-codecs/bin; then + IPPVER=5 + IPPSAMP_DIR=`ls -d $IPPSAMPLES/speech-codecs/bin/*gcc*/lib | head -1` + elif test -d $IPPSAMPLES/speech-codecs/_bin; then + IPPVER=6 + if test -d $IPPSAMPLES/speech-codecs/_bin/*gcc*; then + # gcc compiler + IPPSAMP_DIR=`ls -d $IPPSAMPLES/speech-codecs/_bin/*gcc*/lib | head -1` + elif test -d $IPPSAMPLES/speech-codecs/_bin/*icc*; then + # icc compiler + IPPSAMP_DIR=`ls -d $IPPSAMPLES/speech-codecs/_bin/*icc*/lib | head -1` + else + AC_MSG_FAILURE([Unable to find to find built binaries under $IPPSAMPLES/speech-codecs/{bin,_bin}. Have you built the IPP samples?]) + fi + else + AC_MSG_FAILURE([unable to find $IPPSAMPLES/speech-codecs/bin/*gcc*/lib or $IPPSAMPLES/speech-codecs/_bin/*gcc*/lib directory. Have you built the samples?]) + fi + + # Test the directory + if test ! -d $IPPSAMP_DIR; then + AC_MSG_FAILURE([There's something wrong with this script, directory $IPPSAMP_DIR does not exist]) + exit 1; + fi + + if test "x$IPPVER" = "x5"; then + IPPSAMP_LIBS="libusc.a" + IPPSAMP_LDLIBS="-lusc" + elif test "x$IPPVER" = "x6"; then + IPPSAMP_LIBS="libspeech.a" + IPPSAMP_LDLIBS="-lspeech" + else + AC_MSG_FAILURE([bug in this script: unsupported IPP version]) + fi + + if test ! -f $IPPSAMP_DIR/$IPPSAMP_LIBS; then + AC_MSG_FAILURE([$IPPSAMP_LIBS doesn't exist in $IPPSAMP_DIR]) + fi + + AC_MSG_RESULT([$IPPSAMP_DIR]) + + SAVED_CFLAGS="$CFLAGS" + SAVED_LDFLAGS="$LDFLAGS" + SAVED_LIBS="$LIBS" + + IPPSAMP_INC="-I$IPPSAMPLES/speech-codecs/core/usc/include" + CFLAGS="$CFLAGS $IPPSAMP_INC" + LDFLAGS="$LDFLAGS -L$IPPSAMP_DIR" + LIBS="$IPPSAMP_LDLIBS $LIBS" + + AC_MSG_CHECKING([Intel IPP USC usability]) + AC_LINK_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include ]], + [extern USC_Fxns USC_G729AFP_Fxns;]) + ], + [AC_MSG_RESULT(yes)], + [AC_MSG_FAILURE(no)] + ) + + CFLAGS="$SAVED_CFLAGS" + LDFLAGS="$IPP_LDFLAGS $SAVED_LDFLAGS" + LIBS="$IPP_LIBS $SAVED_LIBS" + + IPP_CFLAGS="$IPP_CFLAGS $IPPSAMP_INC" + IPP_LDFLAGS="$IPP_LDFLAGS -L$IPPSAMP_DIR" + IPP_LIBS="$IPPSAMP_LDLIBS $IPP_LIBS" fi CFLAGS="$CFLAGS $IPP_CFLAGS" @@ -1856,9 +2051,9 @@ if test "x$enable_ipp" != "xno"; then LIBS="$LIBS $IPP_LIBS" ac_build_mak_vars="$ac_build_mak_vars\n\ -export IPP_CFLAGS=$IPP_CFLAGS\n\ -export IPP_LDFLAGS=$IPP_LDFLAGS\n\ -export IPP_LIBS=$IPP_LIBS" + export IPP_CFLAGS=$IPP_CFLAGS\n\ + export IPP_LDFLAGS=$IPP_LDFLAGS\n\ + export IPP_LIBS=$IPP_LIBS" else AC_MSG_RESULT([Skipping Intel IPP settings (not wanted)]) fi @@ -1867,25 +2062,29 @@ dnl # Include Android MediaCodec AC_SUBST(ac_no_mediacodec) AC_ARG_ENABLE(android-mediacodec, - AS_HELP_STRING([--disable-android-mediacodec], - [Exclude Android MediaCodec (default: autodetect)]), - [if test "$enable_android_mediacodec" = "no"; then - [ac_no_mediacodec=1] - AC_MSG_RESULT([Checking if Android MediaCodec support is disabled... yes]) - fi], - [ - case $target in - *android*) - AC_CHECK_LIB(mediandk,AMediaCodec_createDecoderByType,[ac_pjmedia_has_amediacodec=1 && LIBS="-lmediandk $LIBS"]) - if test "x$ac_pjmedia_has_amediacodec" = "x1"; then - AC_MSG_RESULT([Checking if Android AMediaCodec library is available... yes]) - AC_DEFINE(PJMEDIA_HAS_ANDROID_MEDIACODEC, 1) - else - AC_MSG_RESULT([Checking if Android AMediaCodec library is available... no]) - fi - ;; - esac - ]) + AS_HELP_STRING([--disable-android-mediacodec], [Exclude Android MediaCodec (default: autodetect)]), + [ + if test "$enable_android_mediacodec" = "no"; then + [ac_no_mediacodec=1] + AC_MSG_RESULT([Checking if Android MediaCodec support is disabled... yes]) + fi + ], + [ + case $target in + *android*) + AC_CHECK_LIB(mediandk, AMediaCodec_createDecoderByType, [ + ac_pjmedia_has_amediacodec=1 && LIBS="-lmediandk $LIBS"]) + + if test "x$ac_pjmedia_has_amediacodec" = "x1"; then + AC_MSG_RESULT([Checking if Android AMediaCodec library is available... yes]) + AC_DEFINE(PJMEDIA_HAS_ANDROID_MEDIACODEC, 1) + else + AC_MSG_RESULT([Checking if Android AMediaCodec library is available... no]) + fi + ;; + esac + ] +) dnl ########################################## dnl # @@ -1895,20 +2094,19 @@ dnl # dnl # SSL alt prefix AC_ARG_WITH(ssl, AS_HELP_STRING([--with-ssl=DIR], - [Specify alternate SSL library prefix. This option will try - to find OpenSSL first, then if not found, GnuTLS. To skip - OpenSSL finding, use --with-gnutls option instead.]), + [Specify alternate SSL library prefix. This option will try + to find OpenSSL first, then if not found, GnuTLS. To skip + OpenSSL finding, use --with-gnutls option instead.]), [], [with_ssl=no] - ) +) dnl # GnuTLS alt prefix AC_ARG_WITH(gnutls, - AS_HELP_STRING([--with-gnutls=DIR], - [Specify alternate GnuTLS prefix]), + AS_HELP_STRING([--with-gnutls=DIR], [Specify alternate GnuTLS prefix]), [], [with_gnutls=no] - ) +) dnl # Do not use default SSL installation if we are cross-compiling if test "x$ac_cross_compile" != "x" -a "x$with_ssl" = "xno" -a "x$with_gnutls" = "xno"; then @@ -1921,154 +2119,170 @@ AC_SUBST(ac_ssl_has_aes_gcm,0) AC_SUBST(ac_ssl_backend) AC_ARG_ENABLE(darwin-ssl, - AS_HELP_STRING([--disable-darwin-ssl], - [Exclude Darwin SSL (default: autodetect)]), - [if test "$enable_darwin_ssl" = "no"; then - AC_MSG_RESULT([Checking if Darwin SSL support is disabled... yes]) - fi], - [ - case $target in - *darwin*) - SAVED_CFLAGS="$CFLAGS" - CFLAGS="-Werror" - SAVED_LIBS="$LIBS" - LIBS="-framework Security" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], - [if (__builtin_available(macOS 10.12, iOS 10.0, *)) { - SSLContextRef ssl_ctx; - SSLReHandshake(ssl_ctx); - }])], - [ac_ssl_backend=darwin],) - CFLAGS="$SAVED_CFLAGS" - LIBS="$SAVED_LIBS" - if test "x$ac_ssl_backend" = "xdarwin"; then - AC_DEFINE(PJ_HAS_SSL_SOCK, 1) - AC_DEFINE(PJ_SSL_SOCK_IMP, PJ_SSL_SOCK_IMP_DARWIN) - LIBS="$LIBS -framework Security" - AC_MSG_RESULT([Checking if Darwin SSL is available... yes]) - else - AC_MSG_RESULT([Checking if Darwin SSL is available... no]) - fi - ;; - esac - ]) + AS_HELP_STRING([--disable-darwin-ssl], [Exclude Darwin SSL (default: autodetect)]), + [ + if test "$enable_darwin_ssl" = "no"; then + AC_MSG_RESULT([Checking if Darwin SSL support is disabled... yes]) + fi + ], + [ + case $target in + *darwin*) + SAVED_CFLAGS="$CFLAGS" + CFLAGS="-Werror" + SAVED_LIBS="$LIBS" + + LIBS="-framework Security" + AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include ]], + [if (__builtin_available(macOS 10.12, iOS 10.0, *)) { + SSLContextRef ssl_ctx; + SSLReHandshake(ssl_ctx); + }]) + ], + [ac_ssl_backend=darwin], + ) + + CFLAGS="$SAVED_CFLAGS" + LIBS="$SAVED_LIBS" + if test "x$ac_ssl_backend" = "xdarwin"; then + AC_DEFINE(PJ_HAS_SSL_SOCK, 1) + AC_DEFINE(PJ_SSL_SOCK_IMP, PJ_SSL_SOCK_IMP_DARWIN) + LIBS="$LIBS -framework Security" + AC_MSG_RESULT([Checking if Darwin SSL is available... yes]) + else + AC_MSG_RESULT([Checking if Darwin SSL is available... no]) + fi + ;; + esac + ] +) AC_ARG_ENABLE(ssl, - AS_HELP_STRING([--disable-ssl], - [Exclude SSL support the build (default: autodetect)]) - , - [ - if test "$enable_ssl" = "no"; then - [ac_no_ssl=1] - AC_MSG_RESULT([Checking if SSL support is disabled... yes]) - fi - ], - [ - if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then - CFLAGS="$CFLAGS -I$with_ssl/include" - CPPFLAGS="$CPPFLAGS -I$with_ssl/include" - LDFLAGS="$LDFLAGS -L$with_ssl/lib" - AC_MSG_RESULT([Using SSL prefix... $with_ssl]) + AS_HELP_STRING([--disable-ssl], [Exclude SSL support the build (default: autodetect)]), + [ + if test "$enable_ssl" = "no"; then + [ac_no_ssl=1] + AC_MSG_RESULT([Checking if SSL support is disabled... yes]) + fi + ], + [ + if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then + CFLAGS="$CFLAGS -I$with_ssl/include" + CPPFLAGS="$CPPFLAGS -I$with_ssl/include" + LDFLAGS="$LDFLAGS -L$with_ssl/lib" + AC_MSG_RESULT([Using SSL prefix... $with_ssl]) + fi + + if test "x$with_gnutls" = "xno"; then + # We still need to check for OpenSSL installations even if + # we find Darwin SSL above since DTLS requires OpenSSL. + AC_MSG_RESULT([checking for OpenSSL installations..]) + AC_SUBST(openssl_h_present) + AC_SUBST(libssl_present) + AC_SUBST(libcrypto_present) + AC_CHECK_HEADER(openssl/ssl.h,[openssl_h_present=1]) + + AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[ + libcrypto_present=1 && LIBS="-lcrypto $LIBS"], + [ + AC_CHECK_LIB(crypto,ERR_get_error,[libcrypto_present=1 && LIBS="-lcrypto $LIBS"]) + ] + ) + + AC_CHECK_LIB(ssl,SSL_CTX_new,[libssl_present=1 && LIBS="-lssl $LIBS"]) + + if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then + AC_MSG_RESULT([OpenSSL library found, SSL support enabled]) + + # Check if SRTP should be compiled with OpenSSL + # support, to enable cryptos such as AES GCM. + + # EVP_CIPHER_CTX is now opaque in OpenSSL 1.1.0, libsrtp 1.5.4 uses it as a transparent type. + # Update 2.7: our bundled libsrtp has been upgraded to 2.1.0, + # so we can omit EVP_CIPHER_CTX definition check now. + AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include ]], + [EVP_CIPHER_CTX *ctx;EVP_aes_128_gcm();]) + ], + [ + AC_CHECK_LIB(crypto,EVP_aes_128_gcm,[ac_ssl_has_aes_gcm=1]) + ] + ) + + if test "x$ac_ssl_has_aes_gcm" = "x1"; then + AC_MSG_RESULT([OpenSSL has AES GCM support, SRTP will use OpenSSL]) + else + AC_MSG_RESULT([OpenSSL AES GCM support not found, SRTP will only support AES CM cryptos]) fi - if test "x$with_gnutls" = "xno"; then - # We still need to check for OpenSSL installations even if - # we find Darwin SSL above since DTLS requires OpenSSL. - AC_MSG_RESULT([checking for OpenSSL installations..]) - AC_SUBST(openssl_h_present) - AC_SUBST(libssl_present) - AC_SUBST(libcrypto_present) - AC_CHECK_HEADER(openssl/ssl.h,[openssl_h_present=1]) - AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && LIBS="-lcrypto $LIBS"], [AC_CHECK_LIB(crypto,ERR_get_error,[libcrypto_present=1 && LIBS="-lcrypto $LIBS"])]) - AC_CHECK_LIB(ssl,SSL_CTX_new,[libssl_present=1 && LIBS="-lssl $LIBS"]) - if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then - AC_MSG_RESULT([OpenSSL library found, SSL support enabled]) - - # Check if SRTP should be compiled with OpenSSL - # support, to enable cryptos such as AES GCM. - - # EVP_CIPHER_CTX is now opaque in OpenSSL 1.1.0, libsrtp 1.5.4 uses it as a transparent type. - # Update 2.7: our bundled libsrtp has been upgraded to 2.1.0, - # so we can omit EVP_CIPHER_CTX definition check now. - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], - [EVP_CIPHER_CTX *ctx;EVP_aes_128_gcm();])], - [AC_CHECK_LIB(crypto,EVP_aes_128_gcm,[ac_ssl_has_aes_gcm=1])]) - if test "x$ac_ssl_has_aes_gcm" = "x1"; then - AC_MSG_RESULT([OpenSSL has AES GCM support, SRTP will use OpenSSL]) - else - AC_MSG_RESULT([OpenSSL AES GCM support not found, SRTP will only support AES CM cryptos]) - fi - - if test "x$ac_ssl_backend" = "x"; then - # PJSIP_HAS_TLS_TRANSPORT setting follows PJ_HAS_SSL_SOCK - #AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1) - AC_DEFINE(PJ_HAS_SSL_SOCK, 1) - AC_DEFINE(PJ_SSL_SOCK_IMP, PJ_SSL_SOCK_IMP_OPENSSL) - ac_ssl_backend="openssl" - fi - else - AC_MSG_RESULT([** OpenSSL libraries not found **]) - fi - - fi - - if test "x$ac_ssl_backend" = "x"; then - - if test "x$with_gnutls" != "xno" -a "x$with_gnutls" != "x"; then - CFLAGS="$CFLAGS -I$with_gnutls/include" - LDFLAGS="$LDFLAGS -L$with_gnutls/lib" - AC_MSG_RESULT([Using GnuTLS prefix... $with_gnutls]) - fi - - AC_CHECK_PROGS(PKG_CONFIG, - $host-pkg-config pkg-config "python pkgconfig.py", - none) - AC_MSG_RESULT([checking for GnuTLS installations..]) - AC_SUBST(gnutls_h_present) - AC_SUBST(libgnutls_present) - AC_CHECK_HEADER(gnutls/gnutls.h, [gnutls_h_present=1]) - - if test "$PKG_CONFIG" != "none"; then - if $PKG_CONFIG --exists gnutls; then - LIBS="$LIBS `$PKG_CONFIG --libs gnutls`" - libgnutls_present=1 - else - AC_CHECK_LIB(gnutls, - gnutls_certificate_set_x509_system_trust, - [libgnutls_present=1 && - LIBS="$LIBS -lgnutls"]) - fi - else - AC_MSG_RESULT([*** Warning: neither pkg-config nor python is available, disabling gnutls. ***]) - fi - - if test "x$gnutls_h_present" = "x1" -a "x$libgnutls_present" = "x1"; then - AC_MSG_RESULT([GnuTLS library found, SSL support enabled]) - AC_DEFINE(PJ_HAS_SSL_SOCK, 1) - AC_DEFINE(PJ_SSL_SOCK_IMP, PJ_SSL_SOCK_IMP_GNUTLS) - ac_ssl_backend="gnutls" - else - AC_MSG_RESULT([** No GnuTLS libraries found, disabling SSL support **]) - fi - - fi - ]) + if test "x$ac_ssl_backend" = "x"; then + # PJSIP_HAS_TLS_TRANSPORT setting follows PJ_HAS_SSL_SOCK + #AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1) + AC_DEFINE(PJ_HAS_SSL_SOCK, 1) + AC_DEFINE(PJ_SSL_SOCK_IMP, PJ_SSL_SOCK_IMP_OPENSSL) + ac_ssl_backend="openssl" + fi + else + AC_MSG_RESULT([** OpenSSL libraries not found **]) + fi + fi + + if test "x$ac_ssl_backend" = "x"; then + if test "x$with_gnutls" != "xno" -a "x$with_gnutls" != "x"; then + CFLAGS="$CFLAGS -I$with_gnutls/include" + LDFLAGS="$LDFLAGS -L$with_gnutls/lib" + AC_MSG_RESULT([Using GnuTLS prefix... $with_gnutls]) + fi + + AC_MSG_RESULT([checking for GnuTLS installations..]) + AC_SUBST(gnutls_h_present) + AC_SUBST(libgnutls_present) + AC_CHECK_HEADER(gnutls/gnutls.h, [gnutls_h_present=1]) + + if test "$PKG_CONFIG" != "none"; then + if $PKG_CONFIG --exists gnutls; then + LIBS="$LIBS `$PKG_CONFIG --libs gnutls`" + libgnutls_present=1 + else + AC_CHECK_LIB(gnutls, gnutls_certificate_set_x509_system_trust, [ + libgnutls_present=1 && LIBS="$LIBS -lgnutls"]) + fi + else + AC_MSG_RESULT([*** Warning: neither pkg-config nor python is available, disabling gnutls. ***]) + fi + + if test "x$gnutls_h_present" = "x1" -a "x$libgnutls_present" = "x1"; then + AC_MSG_RESULT([GnuTLS library found, SSL support enabled]) + AC_DEFINE(PJ_HAS_SSL_SOCK, 1) + AC_DEFINE(PJ_SSL_SOCK_IMP, PJ_SSL_SOCK_IMP_GNUTLS) + ac_ssl_backend="gnutls" + else + AC_MSG_RESULT([** No GnuTLS libraries found, disabling SSL support **]) + fi + + fi + ] +) dnl # Obsolete option --with-opencore-amrnb AC_ARG_WITH(opencore-amrnb, AS_HELP_STRING([--with-opencore-amrnb=DIR], - [This option is obsolete and replaced by --with-opencore-amr=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 AC_ARG_WITH(opencore-amr, - AS_HELP_STRING([--with-opencore-amr=DIR], - [Specify alternate libopencore-amr prefix]), + AS_HELP_STRING([--with-opencore-amr=DIR], [Specify alternate libopencore-amr prefix]), [], [with_opencore_amr=no] - ) +) dnl # Do not use default opencore-amr installation if we are cross-compiling if test "x$ac_cross_compile" != "x" -a "x$with_opencore_amr" = "xno"; then @@ -2077,11 +2291,10 @@ fi dnl # vo-amrwbenc alt prefix AC_ARG_WITH(opencore-amrwbenc, - AS_HELP_STRING([--with-opencore-amrwbenc=DIR], - [Specify alternate libvo-amrwbenc prefix]), + AS_HELP_STRING([--with-opencore-amrwbenc=DIR], [Specify alternate libvo-amrwbenc prefix]), [], [with_opencore_amrwbenc=no] - ) +) dnl # Do not use default vo-amrwbenc installation if we are cross-compiling if test "x$ac_cross_compile" != "x" -a "x$with_opencore_amrwbenc" = "xno"; then @@ -2093,68 +2306,75 @@ dnl # Include opencore-amr support AC_SUBST(ac_no_opencore_amrnb) AC_SUBST(ac_no_opencore_amrwb) AC_ARG_ENABLE(opencore_amr, - AS_HELP_STRING([--disable-opencore-amr], - [Exclude OpenCORE AMR support from the build (default: autodetect)]) - , - [ - if test "$enable_opencore_amr" = "no"; then - [ac_no_opencore_amrnb=1] - [ac_no_opencore_amrwb=1] - AC_DEFINE(PJMEDIA_HAS_OPENCORE_AMRNB_CODEC,0) - AC_DEFINE(PJMEDIA_HAS_OPENCORE_AMRWB_CODEC,0) - AC_MSG_RESULT([Checking if OpenCORE AMR support is disabled... yes]) - fi - ], - [ - AC_MSG_RESULT([checking for OpenCORE AMR installations..]) - if test "x$with_opencore_amr" != "xno" -a "x$with_opencore_amr" != "x"; then - CFLAGS="$CFLAGS -I$with_opencore_amr/include" - CPPFLAGS="$CPPFLAGS -I$with_opencore_amr/include" - LDFLAGS="$LDFLAGS -L$with_opencore_amr/lib" - AC_MSG_RESULT([Using OpenCORE AMR prefix... $with_opencore_amr]) - fi - if test "x$with_opencore_amrwbenc" != "xno" -a "x$with_opencore_amrwbenc" != "x"; then - CFLAGS="$CFLAGS -I$with_opencore_amrwbenc/include" - CPPFLAGS="$CPPFLAGS -I$with_opencore_amrwbenc/include" - LDFLAGS="$LDFLAGS -L$with_opencore_amrwbenc/lib" - AC_MSG_RESULT([Using OpenCORE AMRWB-enc prefix... $with_opencore_amrwbenc]) - fi - AC_SUBST(opencore_amrnb_h_present) - AC_SUBST(opencore_amrnb_present) - AC_CHECK_HEADER(opencore-amrnb/interf_enc.h,[opencore_amrnb_h_present=1]) - AC_CHECK_LIB(opencore-amrnb,Encoder_Interface_init,[opencore_amrnb_present=1 && LIBS="$LIBS -lopencore-amrnb"]) - if test "x$opencore_amrnb_h_present" = "x1" -a "x$opencore_amrnb_present" = "x1"; then - AC_MSG_RESULT([OpenCORE AMR-NB library found, AMR-NB support enabled]) - AC_DEFINE(PJMEDIA_HAS_OPENCORE_AMRNB_CODEC,1) - else - [ac_no_opencore_amrnb=1] - AC_DEFINE(PJMEDIA_HAS_OPENCORE_AMRNB_CODEC,0) - fi - AC_SUBST(opencore_amrwb_enc_h_present) - AC_SUBST(opencore_amrwb_enc_present) - AC_SUBST(opencore_amrwb_dec_h_present) - AC_SUBST(opencore_amrwb_dec_present) - AC_CHECK_HEADER(vo-amrwbenc/enc_if.h,[opencore_amrwb_enc_h_present=1]) - AC_CHECK_HEADER(opencore-amrwb/dec_if.h,[opencore_amrwb_dec_h_present=1]) - AC_CHECK_LIB(opencore-amrwb,D_IF_init,[opencore_amrwb_dec_present=1 && LIBS="$LIBS -lopencore-amrwb"]) - AC_CHECK_LIB(vo-amrwbenc,E_IF_init,[opencore_amrwb_enc_present=1 && LIBS="$LIBS -lvo-amrwbenc"]) - if test "x$opencore_amrwb_enc_h_present" = "x1" -a "x$opencore_amrwb_dec_h_present" = "x1" -a "x$opencore_amrwb_enc_present" = "x1" -a "x$opencore_amrwb_dec_present" = "x1"; then - AC_MSG_RESULT([OpenCORE AMR-WB library found, AMR-WB support enabled]) - AC_DEFINE(PJMEDIA_HAS_OPENCORE_AMRWB_CODEC,1) - else - [ac_no_opencore_amrwb=1] - AC_DEFINE(PJMEDIA_HAS_OPENCORE_AMRWB_CODEC,0) - fi - - ]) + AS_HELP_STRING([--disable-opencore-amr], [Exclude OpenCORE AMR support from the build (default: autodetect)]), + [ + if test "$enable_opencore_amr" = "no"; then + [ac_no_opencore_amrnb=1] + [ac_no_opencore_amrwb=1] + AC_DEFINE(PJMEDIA_HAS_OPENCORE_AMRNB_CODEC,0) + AC_DEFINE(PJMEDIA_HAS_OPENCORE_AMRWB_CODEC,0) + AC_MSG_RESULT([Checking if OpenCORE AMR support is disabled... yes]) + fi + ], + [ + AC_MSG_RESULT([checking for OpenCORE AMR installations..]) + if test "x$with_opencore_amr" != "xno" -a "x$with_opencore_amr" != "x"; then + CFLAGS="$CFLAGS -I$with_opencore_amr/include" + CPPFLAGS="$CPPFLAGS -I$with_opencore_amr/include" + LDFLAGS="$LDFLAGS -L$with_opencore_amr/lib" + AC_MSG_RESULT([Using OpenCORE AMR prefix... $with_opencore_amr]) + fi + + if test "x$with_opencore_amrwbenc" != "xno" -a "x$with_opencore_amrwbenc" != "x"; then + CFLAGS="$CFLAGS -I$with_opencore_amrwbenc/include" + CPPFLAGS="$CPPFLAGS -I$with_opencore_amrwbenc/include" + LDFLAGS="$LDFLAGS -L$with_opencore_amrwbenc/lib" + AC_MSG_RESULT([Using OpenCORE AMRWB-enc prefix... $with_opencore_amrwbenc]) + fi + + AC_SUBST(opencore_amrnb_h_present) + AC_SUBST(opencore_amrnb_present) + AC_CHECK_HEADER(opencore-amrnb/interf_enc.h,[opencore_amrnb_h_present=1]) + AC_CHECK_LIB(opencore-amrnb,Encoder_Interface_init,[ + opencore_amrnb_present=1 && LIBS="$LIBS -lopencore-amrnb"]) + + if test "x$opencore_amrnb_h_present" = "x1" -a "x$opencore_amrnb_present" = "x1"; then + AC_MSG_RESULT([OpenCORE AMR-NB library found, AMR-NB support enabled]) + AC_DEFINE(PJMEDIA_HAS_OPENCORE_AMRNB_CODEC,1) + else + [ac_no_opencore_amrnb=1] + AC_DEFINE(PJMEDIA_HAS_OPENCORE_AMRNB_CODEC,0) + fi + + AC_SUBST(opencore_amrwb_enc_h_present) + AC_SUBST(opencore_amrwb_enc_present) + AC_SUBST(opencore_amrwb_dec_h_present) + AC_SUBST(opencore_amrwb_dec_present) + AC_CHECK_HEADER(vo-amrwbenc/enc_if.h,[opencore_amrwb_enc_h_present=1]) + AC_CHECK_HEADER(opencore-amrwb/dec_if.h,[opencore_amrwb_dec_h_present=1]) + + AC_CHECK_LIB(opencore-amrwb,D_IF_init,[ + opencore_amrwb_dec_present=1 && LIBS="$LIBS -lopencore-amrwb"]) + + AC_CHECK_LIB(vo-amrwbenc,E_IF_init,[ + opencore_amrwb_enc_present=1 && LIBS="$LIBS -lvo-amrwbenc"]) + + if test "x$opencore_amrwb_enc_h_present" = "x1" -a "x$opencore_amrwb_dec_h_present" = "x1" -a "x$opencore_amrwb_enc_present" = "x1" -a "x$opencore_amrwb_dec_present" = "x1"; then + AC_MSG_RESULT([OpenCORE AMR-WB library found, AMR-WB support enabled]) + AC_DEFINE(PJMEDIA_HAS_OPENCORE_AMRWB_CODEC,1) + else + [ac_no_opencore_amrwb=1] + AC_DEFINE(PJMEDIA_HAS_OPENCORE_AMRWB_CODEC,0) + fi + ] +) dnl # SILK prefix AC_ARG_WITH(silk, - AS_HELP_STRING([--with-silk=DIR], - [Specify alternate SILK prefix]), + AS_HELP_STRING([--with-silk=DIR], [Specify alternate SILK prefix]), [], [with_silk=no] - ) +) dnl # Do not use default SILK installation if we are cross-compiling if test "x$ac_cross_compile" != "x" -a "x$with_silk" = "xno"; then @@ -2164,36 +2384,38 @@ fi dnl # Include SILK support AC_SUBST(ac_no_silk) AC_ARG_ENABLE(silk, - AS_HELP_STRING([--disable-silk], - [Exclude SILK support from the build (default: autodetect)]) - , - [ - if test "$enable_silk" = "no"; then - [ac_no_silk=1] - AC_DEFINE(PJMEDIA_HAS_SILK_CODEC,0) - AC_MSG_RESULT([Checking if SILK support is disabled... yes]) - fi - ], - [ - AC_MSG_RESULT([checking for SILK installations..]) - if test "x$with_silk" != "xno" -a "x$with_silk" != "x"; then - CFLAGS="$CFLAGS -I$with_silk/interface" - CPPFLAGS="$CPPFLAGS -I$with_silk/interface" - LDFLAGS="$LDFLAGS -L$with_silk" - AC_MSG_RESULT([Using SILK prefix... $with_silk]) - fi - AC_SUBST(silk_h_present) - AC_SUBST(silk_present) - AC_CHECK_HEADER(SKP_Silk_SDK_API.h,[silk_h_present=1]) - AC_CHECK_LIB(SKP_SILK_SDK,SKP_Silk_SDK_get_version,[silk_present=1 && LIBS="$LIBS -lSKP_SILK_SDK"]) - if test "x$silk_h_present" = "x1" -a "x$silk_present" = "x1"; then - AC_MSG_RESULT([SILK library found, SILK support enabled]) - AC_DEFINE(PJMEDIA_HAS_SILK_CODEC,1) - else - [ac_no_silk=1] - AC_DEFINE(PJMEDIA_HAS_SILK_CODEC,0) - fi - ]) + AS_HELP_STRING([--disable-silk], [Exclude SILK support from the build (default: autodetect)]), + [ + if test "$enable_silk" = "no"; then + [ac_no_silk=1] + AC_DEFINE(PJMEDIA_HAS_SILK_CODEC,0) + AC_MSG_RESULT([Checking if SILK support is disabled... yes]) + fi + ], + [ + AC_MSG_RESULT([checking for SILK installations..]) + if test "x$with_silk" != "xno" -a "x$with_silk" != "x"; then + CFLAGS="$CFLAGS -I$with_silk/interface" + CPPFLAGS="$CPPFLAGS -I$with_silk/interface" + LDFLAGS="$LDFLAGS -L$with_silk" + AC_MSG_RESULT([Using SILK prefix... $with_silk]) + fi + + AC_SUBST(silk_h_present) + AC_SUBST(silk_present) + AC_CHECK_HEADER(SKP_Silk_SDK_API.h,[silk_h_present=1]) + AC_CHECK_LIB(SKP_SILK_SDK,SKP_Silk_SDK_get_version,[ + silk_present=1 && LIBS="$LIBS -lSKP_SILK_SDK"]) + + if test "x$silk_h_present" = "x1" -a "x$silk_present" = "x1"; then + AC_MSG_RESULT([SILK library found, SILK support enabled]) + AC_DEFINE(PJMEDIA_HAS_SILK_CODEC,1) + else + [ac_no_silk=1] + AC_DEFINE(PJMEDIA_HAS_SILK_CODEC,0) + 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 @@ -2202,54 +2424,53 @@ fi dnl # OPUS prefix AC_ARG_WITH(opus, - AS_HELP_STRING([--with-opus=DIR], - [Specify alternate OPUS prefix]), + AS_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, - AS_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="-lopus $LIBS"]) - 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 - ]) + AS_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="-lopus $LIBS"]) + + 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 # bcg729 prefix AC_ARG_WITH(bcg729, - AS_HELP_STRING([--with-bcg729=DIR], - [Specify alternate bcg729 prefix]), - [], - [with_bcg729=no] - ) + AS_HELP_STRING([--with-bcg729=DIR], [Specify alternate bcg729 prefix]), + [], + [with_bcg729=no] +) dnl # Do not use default bcg729 installation if we are cross-compiling if test "x$ac_cross_compile" != "x" -a "x$with_bcg729" = "xno"; then @@ -2259,65 +2480,66 @@ fi dnl # bcg729 AC_SUBST(ac_no_bcg729) AC_ARG_ENABLE(bcg729, - AS_HELP_STRING([--disable-bcg729], - [Disable bcg729 (default: not disabled)]), - [ - if test "$enable_bcg729" = "no"; then - [ac_no_bcg729=1] - AC_DEFINE(PJMEDIA_HAS_BCG729,0) - AC_MSG_RESULT([Checking if bcg729 is disabled... yes]) - fi - ], - [ - if test "x$with_bcg729" != "xno" -a "x$with_bcg729" != "x"; then - BCG729_PREFIX=$with_bcg729 - BCG729_CFLAGS="-I$BCG729_PREFIX/include" - BCG729_LDFLAGS="-L$BCG729_PREFIX/lib" - AC_MSG_RESULT([Using bcg729 prefix... $with_bcg729]) - else - BCG729_CFLAGS="" - BCG729_LDFLAGS="" - fi - - AC_MSG_CHECKING([bcg729 usability]) - - BCG729_LIBS="-lbcg729" - - SAVED_LIBS="$LIBS" - SAVED_LDFLAGS="$LDFLAGS" - SAVED_CFLAGS="$CFLAGS" - - LIBS="$BCG729_LIBS $LIBS" - LDFLAGS="$BCG729_LDFLAGS $LDFLAGS" - CFLAGS="$BCG729_CFLAGS $CFLAGS" - - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include - #include - ]], - [initBcg729EncoderChannel(0);] - )], - [ - AC_DEFINE(PJMEDIA_HAS_BCG729,1) - AC_MSG_RESULT(yes) - ], - [ - [ac_no_bcg729=1] - AC_DEFINE(PJMEDIA_HAS_BCG729,0) - LIBS="$SAVED_LIBS" - LDFLAGS="$SAVED_LDFLAGS" - CFLAGS="$SAVED_CFLAGS" - AC_MSG_RESULT(no) - ]) - - ]) - + AS_HELP_STRING([--disable-bcg729], [Disable bcg729 (default: not disabled)]), + [ + if test "$enable_bcg729" = "no"; then + [ac_no_bcg729=1] + AC_DEFINE(PJMEDIA_HAS_BCG729,0) + AC_MSG_RESULT([Checking if bcg729 is disabled... yes]) + fi + ], + [ + if test "x$with_bcg729" != "xno" -a "x$with_bcg729" != "x"; then + BCG729_PREFIX=$with_bcg729 + BCG729_CFLAGS="-I$BCG729_PREFIX/include" + BCG729_LDFLAGS="-L$BCG729_PREFIX/lib" + AC_MSG_RESULT([Using bcg729 prefix... $with_bcg729]) + else + BCG729_CFLAGS="" + BCG729_LDFLAGS="" + fi + + AC_MSG_CHECKING([bcg729 usability]) + + BCG729_LIBS="-lbcg729" + + SAVED_LIBS="$LIBS" + SAVED_LDFLAGS="$LDFLAGS" + SAVED_CFLAGS="$CFLAGS" + + LIBS="$BCG729_LIBS $LIBS" + LDFLAGS="$BCG729_LDFLAGS $LDFLAGS" + CFLAGS="$BCG729_CFLAGS $CFLAGS" + + AC_LINK_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include + #include ]], + [initBcg729EncoderChannel(0);]) + ], + [ + AC_DEFINE(PJMEDIA_HAS_BCG729,1) + AC_MSG_RESULT(yes) + ], + [ + [ac_no_bcg729=1] + AC_DEFINE(PJMEDIA_HAS_BCG729,0) + LIBS="$SAVED_LIBS" + LDFLAGS="$SAVED_LDFLAGS" + CFLAGS="$SAVED_CFLAGS" + AC_MSG_RESULT(no) + ] + ) + ] +) + dnl # lyra prefix AC_ARG_WITH(lyra, - AS_HELP_STRING([--with-lyra=DIR], - [Specify alternate lyra prefix]), - [], - [with_lyra=no] - ) + AS_HELP_STRING([--with-lyra=DIR], [Specify alternate lyra prefix]), + [], + [with_lyra=no] +) dnl # Do not use default lyra installation if we are cross-compiling if test "x$ac_cross_compile" != "x" -a "x$with_lyra" = "xno"; then @@ -2328,93 +2550,113 @@ dnl # lyra AC_SUBST(ac_no_lyra_codec) AC_SUBST(ac_lyra_model_path) AC_ARG_ENABLE(lyra, - AS_HELP_STRING([--disable-lyra], - [Disable lyra (default: not disabled)]), - [ - if test "$enable_lyra" = "no"; then - [ac_no_lyra_codec=1] - AC_DEFINE(PJMEDIA_HAS_LYRA_CODEC,0) - AC_MSG_RESULT([Checking if lyra is disabled... yes]) - fi - ], - [ - if test "x$with_lyra" != "xno" -a "x$with_lyra" != "x"; then - LYRA_PREFIX=$with_lyra - dnl # inside autoconf, single quoted preprocessor definition will raise error - LYRA_CPPFLAGS="-DGLOG_DEPRECATED=__attribute__((deprecated)) -DGLOG_EXPORT=__attribute__((visibility(\"default\"))) -DGLOG_NO_EXPORT=__attribute__((visibility(\"default\")))" - LYRA_CXXFLAGS="-std=c++17 -Wno-deprecated-builtins -I$LYRA_PREFIX/include/com_google_absl -I$LYRA_PREFIX/include/gulrak_filesystem -I$LYRA_PREFIX/include/com_google_glog/src -I$LYRA_PREFIX" - LYRA_LDFLAGS="-L$LYRA_PREFIX/lib" - AC_MSG_RESULT([Using lyra prefix... $with_lyra]) - else - LYRA_CXXFLAGS="" - LYRA_LDFLAGS="" - fi - - AC_MSG_CHECKING([lyra usability]) - - LYRA_LIBS="-llyra" - - SAVED_LIBS="$LIBS" - SAVED_LDFLAGS="$LDFLAGS" - SAVED_CXXFLAGS="$CXXFLAGS" - SAVED_CPPFLAGS="$CPPFLAGS" - - LIBS="$LYRA_LIBS $LIBS" - LDFLAGS="$LYRA_LDFLAGS $LDFLAGS" - CXXFLAGS="$LYRA_CXXFLAGS $CXXFLAGS" - CPPFLAGS="$LYRA_CPPFLAGS $CPPFLAGS" - - AC_LANG_PUSH([C++]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "lyra_decoder.h" - ]], - [std::unique_ptr dec = chromemedia::codec::LyraDecoder::Create(8000,1,"");] - )], - [ - [ac_lyra_model_path="$LYRA_PREFIX/model_coeffs"] - AC_DEFINE(PJMEDIA_HAS_LYRA_CODEC,1) - dnl # use single quoted preprocessor definition - LYRA_CPPFLAGS="'-DGLOG_DEPRECATED=__attribute__((deprecated))' '-DGLOG_EXPORT=__attribute__((visibility(\"default\")))' '-DGLOG_NO_EXPORT=__attribute__((visibility(\"default\")))'" - CXXFLAGS="$LYRA_CPPFLAGS $CXXFLAGS" - AC_MSG_RESULT(yes) - ], - [ - [ac_no_lyra_codec=1] - LIBS="$SAVED_LIBS" - LDFLAGS="$SAVED_LDFLAGS" - CXXFLAGS="$SAVED_CXXFLAGS" - AC_MSG_RESULT(no) - ]) - AC_LANG_POP([C++]) - CPPFLAGS="$SAVED_CPPFLAGS" - ]) - - + AS_HELP_STRING([--disable-lyra], [Disable lyra (default: not disabled)]), + [ + if test "$enable_lyra" = "no"; then + [ac_no_lyra_codec=1] + AC_DEFINE(PJMEDIA_HAS_LYRA_CODEC,0) + AC_MSG_RESULT([Checking if lyra is disabled... yes]) + fi + ], + [ + if test "x$with_lyra" != "xno" -a "x$with_lyra" != "x"; then + LYRA_PREFIX=$with_lyra + dnl # inside autoconf, single quoted preprocessor definition will raise error + LYRA_CPPFLAGS="-DGLOG_DEPRECATED=__attribute__((deprecated)) -DGLOG_EXPORT=__attribute__((visibility(\"default\"))) -DGLOG_NO_EXPORT=__attribute__((visibility(\"default\")))" + LYRA_CXXFLAGS="-std=c++17 -Wno-deprecated-builtins -I$LYRA_PREFIX/include/com_google_absl -I$LYRA_PREFIX/include/gulrak_filesystem -I$LYRA_PREFIX/include/com_google_glog/src -I$LYRA_PREFIX" + LYRA_LDFLAGS="-L$LYRA_PREFIX/lib" + AC_MSG_RESULT([Using lyra prefix... $with_lyra]) + else + LYRA_CXXFLAGS="" + LYRA_LDFLAGS="" + fi + + AC_MSG_CHECKING([lyra usability]) + + LYRA_LIBS="-llyra" + + SAVED_LIBS="$LIBS" + SAVED_LDFLAGS="$LDFLAGS" + SAVED_CXXFLAGS="$CXXFLAGS" + SAVED_CPPFLAGS="$CPPFLAGS" + + LIBS="$LYRA_LIBS $LIBS" + LDFLAGS="$LYRA_LDFLAGS $LDFLAGS" + CXXFLAGS="$LYRA_CXXFLAGS $CXXFLAGS" + CPPFLAGS="$LYRA_CPPFLAGS $CPPFLAGS" + + AC_LANG_PUSH([C++]) + AC_LINK_IFELSE( + [ + AC_LANG_PROGRAM([ + [#include "lyra_decoder.h"]], + [std::unique_ptr dec = chromemedia::codec::LyraDecoder::Create(8000,1,"");]) + ], + [ + [ac_lyra_model_path="$LYRA_PREFIX/model_coeffs"] + AC_DEFINE(PJMEDIA_HAS_LYRA_CODEC,1) + dnl # use single quoted preprocessor definition + LYRA_CPPFLAGS="'-DGLOG_DEPRECATED=__attribute__((deprecated))' '-DGLOG_EXPORT=__attribute__((visibility(\"default\")))' '-DGLOG_NO_EXPORT=__attribute__((visibility(\"default\")))'" + CXXFLAGS="$LYRA_CPPFLAGS $CXXFLAGS" + AC_MSG_RESULT(yes) + ], + [ + [ac_no_lyra_codec=1] + LIBS="$SAVED_LIBS" + LDFLAGS="$SAVED_LDFLAGS" + CXXFLAGS="$SAVED_CXXFLAGS" + AC_MSG_RESULT(no) + ] + ) + AC_LANG_POP([C++]) + CPPFLAGS="$SAVED_CPPFLAGS" + ] +) dnl # Include libsrtp AC_SUBST(ac_no_srtp) AC_ARG_ENABLE(libsrtp, - AS_HELP_STRING([--disable-libsrtp], - [Exclude libsrtp in the build]), - [if test "$enable_libsrtp" = "no"; then - [ac_no_srtp=1] - CFLAGS="$CFLAGS -DPJMEDIA_HAS_SRTP=0" - AC_MSG_RESULT([Checking if libsrtp is disabled...yes]) - fi], - AC_MSG_RESULT([Checking if libsrtp is disabled...no])) - + AS_HELP_STRING([--disable-libsrtp], [Exclude libsrtp in the build]), + [ + if test "$enable_libsrtp" = "no"; then + [ac_no_srtp=1] + CFLAGS="$CFLAGS -DPJMEDIA_HAS_SRTP=0" + AC_MSG_RESULT([Checking if libsrtp is disabled...yes]) + fi + ], + AC_MSG_RESULT([Checking if libsrtp is disabled...no]) +) dnl # Include libyuv AC_SUBST(ac_no_yuv) AC_ARG_ENABLE(libyuv, - AS_HELP_STRING([--disable-libyuv], - [Exclude libyuv in the build]), - [if test "$enable_libyuv" = "no"; then - [ac_no_yuv=1] - AC_DEFINE(PJMEDIA_HAS_LIBYUV,0) - AC_MSG_RESULT([Checking if libyuv is disabled...yes]) - fi], - AC_MSG_RESULT([Checking if libyuv is disabled...no])) - + AS_HELP_STRING([--disable-libyuv], [Exclude libyuv in the build]), + [ + if test "$enable_libyuv" = "no"; then + [ac_no_yuv=1] + AC_DEFINE(PJMEDIA_HAS_LIBYUV,0) + AC_MSG_RESULT([Checking if libyuv is disabled...yes]) + fi + ], + AC_MSG_RESULT([Checking if libyuv is disabled...no]) +) + +dnl proper neon detector +SAVED_CFLAGS="$CFLAGS" +case $target_cpu in + arm*) + CFLAGS="-mfpu=neon $CFLAGS" + ;; + aarch64*) + CFLAGS="-march=armv8-a+simd $CFLAGS" + ;; +esac +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM()], + [ax_cv_support_neon_ext=yes], + [ax_cv_support_neon_ext=no] +) +CFLAGS="$SAVED_CFLAGS" dnl # Include webrtc AC_SUBST(ac_no_webrtc) @@ -2422,81 +2664,95 @@ AC_SUBST(ac_webrtc_instset) AC_SUBST(ac_webrtc_cflags) AC_SUBST(ac_webrtc_ldflags) AC_ARG_ENABLE(libwebrtc, - AS_HELP_STRING([--disable-libwebrtc], - [Exclude libwebrtc in the build]), - [if test "$enable_libwebrtc" = "no"; then - [ac_no_webrtc=1] - AC_DEFINE(PJMEDIA_HAS_LIBWEBRTC,0) - AC_MSG_RESULT([Checking if libwebrtc is disabled...yes]) - fi], - [ - AC_MSG_RESULT([Checking if libwebrtc is disabled...no]) - case $target in - *-apple-darwin_ios*) - case $target in - arm64*) - ac_webrtc_instset=neon - ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64" - ;; - *arm*) - ac_webrtc_instset=neon - ;; - *) - ac_webrtc_instset=sse2 - ;; - esac - ;; - *android*) - case $TARGET_ABI in - armeabi-v7a) - ac_webrtc_instset=neon - ac_webrtc_cflags="-mfloat-abi=softfp -mfpu=neon" - ;; - armeabi) - ac_webrtc_instset=neon - ac_webrtc_cflags="-mthumb -mfloat-abi=softfp -mfpu=neon -march=armv7" - ;; - arm64*) - ac_webrtc_instset=neon - ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64" - ;; - mips64*) - ac_webrtc_instset=generic - ;; - mips*) - ac_webrtc_instset=mips - ;; - x86*) - ac_webrtc_instset=sse2 - ;; - *) - ac_webrtc_instset=generic - ;; - esac - ;; - *mingw* | *cygw*) - ac_webrtc_instset=sse2 - ac_webrtc_cflags="-msse2" - ;; - *win32* | *w32* | *darwin* | *linux*) - case $target in - armv7l*gnueabihf) - ac_webrtc_instset=neon - ac_webrtc_cflags="-DWEBRTC_ARCH_ARM_V7 -mfloat-abi=hard -mfpu=neon" - ;; - arm-apple-darwin* | aarch64*) - ac_webrtc_instset=neon - ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64" - ;; - *) - ac_webrtc_instset=sse2 - ;; - esac - ;; - *) - ;; - esac - ]) + AS_HELP_STRING([--disable-libwebrtc], [Exclude libwebrtc in the build]), + [ + if test "$enable_libwebrtc" = "no"; then + [ac_no_webrtc=1] + AC_DEFINE(PJMEDIA_HAS_LIBWEBRTC,0) + AC_MSG_RESULT([Checking if libwebrtc is disabled...yes]) + fi + ], + [ + AC_MSG_RESULT([Checking if libwebrtc is disabled...no]) + case $target in + *-apple-darwin_ios*) + case $target in + arm64*) + ac_webrtc_instset=neon + ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64" + ;; + *arm*) + ac_webrtc_instset=neon + ;; + *) + ac_webrtc_instset=sse2 + ;; + esac + ;; + *android*) + case $TARGET_ABI in + armeabi-v7a) + ac_webrtc_instset=neon + ac_webrtc_cflags="-mfloat-abi=softfp -mfpu=neon" + ;; + armeabi) + ac_webrtc_instset=neon + ac_webrtc_cflags="-mthumb -mfloat-abi=softfp -mfpu=neon -march=armv7" + ;; + arm64*) + ac_webrtc_instset=neon + ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64" + ;; + mips64*) + ac_webrtc_instset=generic + ;; + mips*) + ac_webrtc_instset=mips + ;; + x86*) + ac_webrtc_instset=sse2 + ;; + *) + ac_webrtc_instset=generic + ;; + esac + ;; + *mingw* | *cygw*) + ac_webrtc_instset=sse2 + ac_webrtc_cflags="-msse2" + ;; + *win32* | *w32* | *darwin* | *linux*) + case $target in + arm*gnueabihf) + if test "x$ax_cv_support_neon_ext" = "xyes"; then + ac_webrtc_instset=neon + ac_webrtc_cflags="-DWEBRTC_ARCH_ARM_V7 -mfloat-abi=hard -mfpu=neon" + else + ac_webrtc_instset=generic + fi + ;; + aarch64*) + if test "x$ax_cv_support_neon_ext" = "xyes"; then + ac_webrtc_instset=neon + ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64" + else + ac_webrtc_instset=generic + fi + ;; + arm-apple-darwin*) + ac_webrtc_instset=neon + ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64" + ;; + *) + ac_webrtc_instset=sse2 + ;; + esac + ;; + *) + ;; + esac + ] +) dnl # Include webrtc AEC3 @@ -2505,104 +2761,124 @@ AC_SUBST(ac_webrtc_aec3_instset) AC_SUBST(ac_webrtc_aec3_cflags) AC_SUBST(ac_webrtc_aec3_ldflags) AC_ARG_ENABLE(libwebrtc_aec3, - AS_HELP_STRING([--enable-libwebrtc-aec3], - [Build libwebrtc-aec3 that's included in PJSIP]), - [ - if test "$enable_libwebrtc_aec3" = "yes"; then - # Test if we can build WebRtc AEC3 - AC_MSG_CHECKING([if WebRtc AEC3 can be compiled with C++17]) - - SAVED_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -std=c++17" - - AC_LANG_PUSH([C++]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [])], - [AC_MSG_RESULT(yes) - LD="$CXX"], - [AC_MSG_RESULT(no) - CXXFLAGS="$SAVED_CXXFLAGS" - ac_no_webrtc_aec3=1 - AC_DEFINE(PJMEDIA_HAS_LIBWEBRTC_AEC3,0)]) - AC_LANG_POP([C++]) - - case $target in - *-apple-darwin_ios*) - case $target in - arm64*) - ac_webrtc_aec3_instset=neon - ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM64" - ;; - *arm*) - ac_webrtc_aec3_instset=neon - ;; - *) - ac_webrtc_aec3_instset=sse2 - ;; - esac - ac_webrtc_aec3_cflags+=" -DWEBRTC_IOS=1" - ;; - *android*) - case $TARGET_ABI in - armeabi-v7a) - ac_webrtc_aec3_instset=neon - ac_webrtc_aec3_cflags="-mfloat-abi=softfp -mfpu=neon" - ;; - armeabi) - ac_webrtc_aec3_instset=neon - ac_webrtc_aec3_cflags="-mthumb -mfloat-abi=softfp -mfpu=neon -march=armv7" - ;; - arm64*) - ac_webrtc_aec3_instset=neon - ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM64" - ;; - x86*) - ac_webrtc_aec3_instset=sse2 - ;; - esac - ac_webrtc_aec3_cflags+=" -DWEBRTC_ANDROID=1" - ;; - *mingw* | *cygw*) - ac_webrtc_aec3_instset=sse2 - ac_webrtc_aec3_cflags="-msse2" - ;; - *win32* | *w32* | *darwin* | *linux*) - case $target in - armv7l*gnueabihf) - ac_webrtc_aec3_instset=neon - ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM_V7 -mfloat-abi=hard -mfpu=neon" - ;; - arm-apple-darwin* | aarch64*) - ac_webrtc_aec3_instset=neon - ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM64" - ;; - *) - ac_webrtc_aec3_instset=sse2 - ;; - esac - case $target in - *darwin*) - ac_webrtc_aec3_cflags+=" -DWEBRTC_MAC=1" - ;; - *linux*) - ac_webrtc_aec3_cflags+=" -DWEBRTC_LINUX=1" - ;; - esac - ;; - *) - ;; - esac - ac_webrtc_aec3_cflags+=" -DWEBRTC_APM_DEBUG_DUMP=0 -DWEBRTC_POSIX=1" - else - ac_no_webrtc_aec3=1 - AC_DEFINE(PJMEDIA_HAS_LIBWEBRTC_AEC3,0) - AC_MSG_RESULT([Checking if libwebrtc-aec3 is enabled...no]) - fi - ], - [ac_no_webrtc_aec3=1 - AC_DEFINE(PJMEDIA_HAS_LIBWEBRTC_AEC3,0) - AC_MSG_RESULT([Checking if libwebrtc-aec3 is enabled...no]) - ]) - + AS_HELP_STRING([--enable-libwebrtc-aec3], [Build libwebrtc-aec3 that's included in PJSIP]), + [ + if test "$enable_libwebrtc_aec3" = "yes"; then + # Test if we can build WebRtc AEC3 + AC_MSG_CHECKING([if WebRtc AEC3 can be compiled with C++17]) + + SAVED_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -std=c++17" + + AC_LANG_PUSH([C++]) + AC_LINK_IFELSE( + [ + AC_LANG_PROGRAM([[]], []) + ], + [ + AC_MSG_RESULT(yes) + LD="$CXX" + ], + [ + AC_MSG_RESULT(no) + CXXFLAGS="$SAVED_CXXFLAGS" + ac_no_webrtc_aec3=1 + AC_DEFINE(PJMEDIA_HAS_LIBWEBRTC_AEC3,0) + ] + ) + AC_LANG_POP([C++]) + + case $target in + *-apple-darwin_ios*) + case $target in + arm64*) + ac_webrtc_aec3_instset=neon + ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM64" + ;; + *arm*) + ac_webrtc_aec3_instset=neon + ;; + *) + ac_webrtc_aec3_instset=sse2 + ;; + esac + ac_webrtc_aec3_cflags+=" -DWEBRTC_IOS=1" + ;; + *android*) + case $TARGET_ABI in + armeabi-v7a) + ac_webrtc_aec3_instset=neon + ac_webrtc_aec3_cflags="-mfloat-abi=softfp -mfpu=neon" + ;; + armeabi) + ac_webrtc_aec3_instset=neon + ac_webrtc_aec3_cflags="-mthumb -mfloat-abi=softfp -mfpu=neon -march=armv7" + ;; + arm64*) + ac_webrtc_aec3_instset=neon + ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM64" + ;; + x86*) + ac_webrtc_aec3_instset=sse2 + ;; + esac + ac_webrtc_aec3_cflags+=" -DWEBRTC_ANDROID=1" + ;; + *mingw* | *cygw*) + ac_webrtc_aec3_instset=sse2 + ac_webrtc_aec3_cflags="-msse2" + ;; + *win32* | *w32* | *darwin* | *linux*) + case $target in + arm*gnueabihf) + if test "x$ax_cv_support_neon_ext" = "xyes"; then + ac_webrtc_aec3_instset=neon + ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM_V7 -mfloat-abi=hard -mfpu=neon" + else + ac_webrtc_aec3_instset=generic + fi + ;; + aarch64*) + if test "x$ax_cv_support_neon_ext" = "xyes"; then + ac_webrtc_aec3_instset=neon + ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM64" + else + ac_webrtc_aec3_instset=generic + fi + ;; + arm-apple-darwin*) + ac_webrtc_aec3_instset=neon + ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM64" + ;; + *) + ac_webrtc_aec3_instset=sse2 + ;; + esac + case $target in + *darwin*) + ac_webrtc_aec3_cflags+=" -DWEBRTC_MAC=1" + ;; + *linux*) + ac_webrtc_aec3_cflags+=" -DWEBRTC_LINUX=1" + ;; + esac + ;; + *) + ;; + esac + ac_webrtc_aec3_cflags+=" -DWEBRTC_APM_DEBUG_DUMP=0 -DWEBRTC_POSIX=1" + else + ac_no_webrtc_aec3=1 + AC_DEFINE(PJMEDIA_HAS_LIBWEBRTC_AEC3,0) + AC_MSG_RESULT([Checking if libwebrtc-aec3 is enabled...no]) + fi + ], + [ + ac_no_webrtc_aec3=1 + AC_DEFINE(PJMEDIA_HAS_LIBWEBRTC_AEC3,0) + AC_MSG_RESULT([Checking if libwebrtc-aec3 is enabled...no]) + ] +) dnl ########################################## dnl # @@ -2615,13 +2891,15 @@ dnl # correct value (max_fd+1). If zero, nfds will be filled up with dnl # PJ_FD_SETSIZE AC_MSG_CHECKING([if select() needs correct nfds]) case $target in - *rtems*) AC_DEFINE(PJ_SELECT_NEEDS_NFDS,1) - AC_MSG_RESULT(yes) - ;; - *) AC_DEFINE(PJ_SELECT_NEEDS_NFDS,0) - AC_MSG_RESULT([no (default)]) - AC_MSG_RESULT([** Decided that select() doesn't need correct nfds (please check)]) - ;; + *rtems*) + AC_DEFINE(PJ_SELECT_NEEDS_NFDS,1) + AC_MSG_RESULT(yes) + ;; + *) + AC_DEFINE(PJ_SELECT_NEEDS_NFDS,0) + AC_MSG_RESULT([no (default)]) + AC_MSG_RESULT([** Decided that select() doesn't need correct nfds (please check)]) + ;; esac dnl # Determine if pj_thread_create() should enforce thread stack size when @@ -2629,46 +2907,52 @@ dnl # creating thread. Default is zero, to allow OS to allocate appropriate dnl # thread's stack size. AC_MSG_CHECKING([if pj_thread_create() should enforce stack size]) case $target in - *rtems*) AC_DEFINE(PJ_THREAD_SET_STACK_SIZE,1) - AC_MSG_RESULT(yes) - ;; - *) AC_DEFINE(PJ_THREAD_SET_STACK_SIZE,0) - AC_MSG_RESULT([no (default)]) - ;; + *rtems*) + AC_DEFINE(PJ_THREAD_SET_STACK_SIZE,1) + AC_MSG_RESULT(yes) + ;; + *) + AC_DEFINE(PJ_THREAD_SET_STACK_SIZE,0) + AC_MSG_RESULT([no (default)]) + ;; esac dnl # Determine if pj_thread_create() should allocate thread's stack from dnl # the pool. Default is zero, to let OS allocate thread's stack. AC_MSG_CHECKING([if pj_thread_create() should allocate stack]) case $target in - *rtems*) AC_DEFINE(PJ_THREAD_ALLOCATE_STACK,1) - AC_MSG_RESULT(yes) - ;; - *) AC_DEFINE(PJ_THREAD_ALLOCATE_STACK,0) - AC_MSG_RESULT([no (default)]) - ;; + *rtems*) + AC_DEFINE(PJ_THREAD_ALLOCATE_STACK,1) + AC_MSG_RESULT(yes) + ;; + *) + AC_DEFINE(PJ_THREAD_ALLOCATE_STACK,0) + AC_MSG_RESULT([no (default)]) + ;; esac dnl # This value specifies the value set in errno by the OS when a non-blocking dnl # socket recv() can not return immediate data. case $target in - *mingw* | *cygw* | *win32* | *w32* ) - AC_DEFINE(PJ_BLOCKING_ERROR_VAL,WSAEWOULDBLOCK) - ;; - *) AC_DEFINE(PJ_BLOCKING_ERROR_VAL,EAGAIN) - AC_MSG_RESULT([** Setting non-blocking recv() retval to EAGAIN (please check)]) - ;; + *mingw* | *cygw* | *win32* | *w32* ) + AC_DEFINE(PJ_BLOCKING_ERROR_VAL,WSAEWOULDBLOCK) + ;; + *) + AC_DEFINE(PJ_BLOCKING_ERROR_VAL,EAGAIN) + AC_MSG_RESULT([** Setting non-blocking recv() retval to EAGAIN (please check)]) + ;; esac dnl # This value specifies the value set in errno by the OS when a non-blocking dnl # socket connect() can not get connected immediately. case $target in - *mingw* | *cygw* | *win32* | *w32* ) - AC_DEFINE(PJ_BLOCKING_CONNECT_ERROR_VAL,WSAEWOULDBLOCK) - ;; - *) AC_DEFINE(PJ_BLOCKING_CONNECT_ERROR_VAL,EINPROGRESS) - AC_MSG_RESULT([** Setting non-blocking connect() retval to EINPROGRESS (please check)]) - ;; + *mingw* | *cygw* | *win32* | *w32* ) + AC_DEFINE(PJ_BLOCKING_CONNECT_ERROR_VAL,WSAEWOULDBLOCK) + ;; + *) + AC_DEFINE(PJ_BLOCKING_CONNECT_ERROR_VAL,EINPROGRESS) + AC_MSG_RESULT([** Setting non-blocking connect() retval to EINPROGRESS (please check)]) + ;; esac dnl @@ -2678,11 +2962,11 @@ dnl # pthread_setname_np()/pthread_set_name_np() in pthread_np.h on bsd dnl case $target in - *linux* | *darwin* | *bsd*) - AC_CHECK_HEADER(pthread_np.h,[AC_DEFINE(PJ_HAS_PTHREAD_NP_H,1)]) - AC_CHECK_FUNC(pthread_setname_np,[AC_DEFINE(PJ_HAS_PTHREAD_SETNAME_NP,1)]) - AC_CHECK_FUNC(pthread_set_name_np,[AC_DEFINE(PJ_HAS_PTHREAD_SET_NAME_NP,1)]) - ;; + *linux* | *darwin* | *bsd*) + AC_CHECK_HEADER(pthread_np.h,[AC_DEFINE(PJ_HAS_PTHREAD_NP_H,1)]) + AC_CHECK_FUNC(pthread_setname_np,[AC_DEFINE(PJ_HAS_PTHREAD_SETNAME_NP,1)]) + AC_CHECK_FUNC(pthread_set_name_np,[AC_DEFINE(PJ_HAS_PTHREAD_SET_NAME_NP,1)]) + ;; esac @@ -2690,19 +2974,18 @@ AC_SUBST(target) AC_SUBST(ac_host,unix) AC_SUBST(ac_main_obj) case $target in - *rtems*) - ac_main_obj=main_rtems.o - ;; - *) - ac_main_obj=main.o - ;; + *rtems*) + ac_main_obj=main_rtems.o + ;; + *) + ac_main_obj=main.o + ;; esac AC_SUBST(CC) ac_build_mak_vars=`echo $ac_build_mak_vars | sed 's/\\\\n/\n/g'` AC_OUTPUT - AC_MSG_RESULT([ Configurations for current target have been written to 'build.mak', and 'os-auto.mak' in various build directories, and pjlib/include/pj/compat/os_auto.h. diff --git a/pjlib/src/pj/os_core_win32.c b/pjlib/src/pj/os_core_win32.c index 183bdce7c1..4941027bdf 100644 --- a/pjlib/src/pj/os_core_win32.c +++ b/pjlib/src/pj/os_core_win32.c @@ -54,17 +54,6 @@ #else # define LOG_MUTEX(expr) PJ_LOG(6,expr) #endif -/* - * To compile construction such as the next: - * - * LOG_MUTEX_WARN((mutex->obj_name, status, - * "Failed to acquire mutex by thread %s", - * pj_thread_this()->obj_name)); - * - * We should redefine LOG_MUTEX_WARN macro using PJ_PERROR, instead of PJ_LOG - * - * # define LOG_MUTEX_WARN(expr) PJ_LOG(3,expr) -*/ # define LOG_MUTEX_WARN(expr) PJ_PERROR(3,expr) #define THIS_FILE "os_core_win32.c" @@ -130,7 +119,7 @@ struct pj_event_t */ struct pj_atomic_t { - long value; + long value; }; /* From 61e69effb8e03e6a40dd5651a87b05ffc6aeca60 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Sun, 24 Nov 2024 20:26:08 +0100 Subject: [PATCH 15/33] merge conflicts resolved --- aconfigure | 4 ++-- aconfigure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aconfigure b/aconfigure index d5d587bfcd..d75eec2722 100755 --- a/aconfigure +++ b/aconfigure @@ -6754,10 +6754,10 @@ fi case $target in *mingw* | *cygw* | *win32* | *w32* ) - ac_os_objs="$ac_os_objs file_access_win32.o file_io_win32.o os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o sock_qos_bsd.o unicode_win32.o" + ac_os_objs="$ac_os_objs file_access_win32.o file_io_win32.o os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o sock_qos_bsd.o unicode_win32.o stack_win32.o" ;; *) - ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o" + ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o stack.o" case $target in *-apple-darwin_ios*) ac_os_objs="$ac_os_objs os_info_iphone.o os_core_darwin.o" diff --git a/aconfigure.ac b/aconfigure.ac index 9095dbf2ce..172805d5e5 100644 --- a/aconfigure.ac +++ b/aconfigure.ac @@ -643,10 +643,10 @@ dnl # OS specific files dnl # case $target in *mingw* | *cygw* | *win32* | *w32* ) - ac_os_objs="$ac_os_objs file_access_win32.o file_io_win32.o os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o sock_qos_bsd.o unicode_win32.o" + ac_os_objs="$ac_os_objs file_access_win32.o file_io_win32.o os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o sock_qos_bsd.o unicode_win32.o stack_win32.o" ;; *) - ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o" + ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o stack.o" case $target in *-apple-darwin_ios*) ac_os_objs="$ac_os_objs os_info_iphone.o os_core_darwin.o" From 44dd7594b3d0d2e3cac800c0a6b4a863beadf189 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Mon, 25 Nov 2024 00:16:43 +0100 Subject: [PATCH 16/33] added some comments about data alignment and macros to control alignment --- pjlib/include/pj/compat/cc_msvc.h | 39 ++++++++++++++++++++++++----- pjlib/include/pj/compat/os_win32.h | 15 ++++++++--- pjlib/include/pj/compat/os_winuwp.h | 8 +++--- 3 files changed, 49 insertions(+), 13 deletions(-) diff --git a/pjlib/include/pj/compat/cc_msvc.h b/pjlib/include/pj/compat/cc_msvc.h index 2cce17982f..51af62623c 100644 --- a/pjlib/include/pj/compat/cc_msvc.h +++ b/pjlib/include/pj/compat/cc_msvc.h @@ -80,6 +80,17 @@ typedef unsigned __int64 pj_uint64_t; #define PJ_UNREACHED(x) +/* + * Standard pjsip macro is not well human readable for use with structures: + * typedef struct PJ_ALIGN_DATA(a{ int value; }, 8) a; + * + * The macros PJ_ALIGN_DATA_PREFIX and PJ_ALIGN_DATA_SUFFIX give us a more readable equivalent syntax: + * typedef struct PJ_ALIGN_DATA_PREFIX(8) a { int value; } PJ_ALIGN_DATA_SUFFIX(8) a; + * + * and PJ_SYS_ALIGN_PREFIX, PJ_SYS_ALIGN_SUFFIX give us an even more readable syntax with the + * platform default alignment: + * typedef struct PJ_SYS_ALIGN_PREFIX a { int value; } PJ_SYS_ALIGN_SUFFIX a; +*/ //#define PJ_ALIGN_DATA(declaration, alignment) __declspec(align(alignment)) declaration //#pragma warning(disable:4324) // structure padded due to align() //#define PJ_ALIGN_DATA(declaration, alignment) __pragma(warning(push)) __pragma(warning(disable:4324)) __declspec(align(alignment)) declaration __pragma(warning(pop)) @@ -87,12 +98,28 @@ typedef unsigned __int64 pj_uint64_t; #define PJ_ALIGN_DATA_SUFFIX(alignment) __pragma(warning(pop)) #define PJ_ALIGN_DATA(declaration, alignment) PJ_ALIGN_DATA_PREFIX(alignment) declaration PJ_ALIGN_DATA_SUFFIX(alignment) -////please add #include into your config_site.h if macro bellow is not compilable -//#define PJ_SYS_ALIGN_PREFIX PJ_ALIGN_DATA_PREFIX(MEMORY_ALLOCATION_ALIGNMENT) -//#define PJ_SYS_ALIGN_SUFFIX PJ_ALIGN_DATA_SUFFIX(MEMORY_ALLOCATION_ALIGNMENT) -/* PJ_POOL_ALIGNMENT is defined in os_win32.h and os_winuwp.h */ -#define PJ_SYS_ALIGN_PREFIX PJ_ALIGN_DATA_PREFIX(PJ_POOL_ALIGNMENT) -#define PJ_SYS_ALIGN_SUFFIX PJ_ALIGN_DATA_SUFFIX(PJ_POOL_ALIGNMENT) + +/* + * PJ_SYS_ALIGN_PREFIX, PJ_SYS_ALIGN_SUFFIX is a readable syntax to use with the + * platform default alignment (see example above). + * The MEMORY_ALLOCATION_ALIGNMENT macro which is 16 on the x64 platform and 8 on the x86 platform + * is the platform default alignment for the Windows platform and is set in winnt.h. + * But it is too early to use MEMORY_ALLOCATION_ALIGNMENT constant here + * so we need to explicity declare alignment as 8 or 16. + */ +#if defined(MEMORY_ALLOCATION_ALIGNMENT) +# define PJ_SYS_ALIGN_PREFIX PJ_ALIGN_DATA_PREFIX(MEMORY_ALLOCATION_ALIGNMENT) +# define PJ_SYS_ALIGN_SUFFIX PJ_ALIGN_DATA_SUFFIX(MEMORY_ALLOCATION_ALIGNMENT) +#elif defined(_WIN64) || defined(_M_ALPHA) +# define PJ_SYS_ALIGN_PREFIX PJ_ALIGN_DATA_PREFIX(16) +# define PJ_SYS_ALIGN_SUFFIX PJ_ALIGN_DATA_SUFFIX(16) +#else +# define PJ_SYS_ALIGN_PREFIX PJ_ALIGN_DATA_PREFIX(8) +# define PJ_SYS_ALIGN_SUFFIX PJ_ALIGN_DATA_SUFFIX(8) +#endif + + + #endif /* __PJ_COMPAT_CC_MSVC_H__ */ diff --git a/pjlib/include/pj/compat/os_win32.h b/pjlib/include/pj/compat/os_win32.h index 82ad1ae333..caab198672 100644 --- a/pjlib/include/pj/compat/os_win32.h +++ b/pjlib/include/pj/compat/os_win32.h @@ -149,10 +149,19 @@ #endif -/* The pj_stack implementation requires and checks that - * PJ_POOL_ALIGNMENT is not less than MEMORY_ALLOCATION_ALIGNMENT - * which is 16 for x64 and 8 for x86 platform +/* + * winnt.h define MEMORY_ALLOCATION_ALIGNMENT as 8 for x86, ARM, ARM64 and 16 for x64 and ARM64EC. * see winnt.h + * + * We need to define PJ_POOL_ALIGNMENT as MEMORY_ALLOCATION_ALIGNMENT for the Windows platform to + * dynamicaly allocate memory used by some Windows APIs. + * For example the pj_stack implementation and possibly some other implemented APIs require and check + * that PJ_POOL_ALIGNMENT is at least equal to MEMORY_ALLOCATION_ALIGNMENT, + * which is 16 on the x64 platform and 8 on the x86 platform. + * + * But it is too early to use MEMORY_ALLOCATION_ALIGNMENT constant here + * so we need to explicity declare PJ_POOL_ALIGNMENT as 8 or 16, as opposed to + * pjsip's default of 4 - see pool.h */ #if defined(MEMORY_ALLOCATION_ALIGNMENT) # define PJ_POOL_ALIGNMENT MEMORY_ALLOCATION_ALIGNMENT diff --git a/pjlib/include/pj/compat/os_winuwp.h b/pjlib/include/pj/compat/os_winuwp.h index 82a0342a93..dd3dbc9765 100644 --- a/pjlib/include/pj/compat/os_winuwp.h +++ b/pjlib/include/pj/compat/os_winuwp.h @@ -145,10 +145,10 @@ */ #define PJ_THREAD_ALLOCATE_STACK 0 -/* The pj_stack implementation requires and checks that - * PJ_POOL_ALIGNMENT is not less than MEMORY_ALLOCATION_ALIGNMENT - * which is 16 for x64 and 8 for x86 platform - * see winnt.h +/* + * We need to define PJ_POOL_ALIGNMENT as MEMORY_ALLOCATION_ALIGNMENT for the Windows platform. + * see winnt.h for MEMORY_ALLOCATION_ALIGNMENT + * see more in os_win32.h */ #if defined(MEMORY_ALLOCATION_ALIGNMENT) # define PJ_POOL_ALIGNMENT MEMORY_ALLOCATION_ALIGNMENT From f0eb2c4ae3fd43a8aa313d208e5abadc08b66f0d Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Tue, 26 Nov 2024 01:02:51 +0100 Subject: [PATCH 17/33] stack_stress_test() added --- pjlib/src/pjlib-test/stack.c | 366 +++++++++++++++++++++++++++++++++++ 1 file changed, 366 insertions(+) diff --git a/pjlib/src/pjlib-test/stack.c b/pjlib/src/pjlib-test/stack.c index ab56532271..94182445a6 100644 --- a/pjlib/src/pjlib-test/stack.c +++ b/pjlib/src/pjlib-test/stack.c @@ -32,11 +32,112 @@ #endif // PJ_WIN32 +#define THIS_FILE "stack.c" +#define MAX_THREADS 16 +#define MAX_RESERVED 16 +#define MAX_SLOTS 100 + +#define TRACE(log) PJ_LOG(3,log) + typedef struct PJ_SYS_ALIGN_PREFIX stack_node { PJ_DECL_STACK_MEMBER(struct stack_node); int value; } PJ_SYS_ALIGN_SUFFIX stack_node; + +/* any useful data; + * here simply pj_thread_t* - thread owned this slot + * alignment of array's items used as stack node under Windows platform should not be less than MEMORY_ALLOCATION_ALIGNMENT + */ +typedef struct PJ_SYS_ALIGN_PREFIX slot_data +{ + PJ_DECL_STACK_MEMBER(struct slot_data); + + pj_thread_t *owner; +} PJ_SYS_ALIGN_SUFFIX slot_data; + +typedef struct slot_data_list +{ + PJ_DECL_LIST_MEMBER(struct list_node); + + pj_thread_t* owner; +} slot_data_list; + +typedef struct stack_test_desc stack_test_desc; +typedef struct stack_test_desc { + struct { + const char *title; + int n_threads; /* number of worker threads */ + + unsigned repeat; /* number of successfull slot reservation on each concurrent thread*/ + + int (*test_init)(stack_test_desc *test); + int (*test_destroy)(stack_test_desc *test); + //slot_data *(*reserve_slot)(stack_test_desc* test); + //void (*release_slot)(stack_test_desc* test, slot_data* slot); + int (*worker_thread)(stack_test_desc* test); + + } cfg; + + struct { + pj_pool_t *pool; + pj_stack_type *empty_slot_stack; /**< Empty slots stack. In current implemetation each stack item store pointer to slot*/ + slot_data slots[MAX_SLOTS]; /**< Array of useful information "slots" (file players, for example).*/ + + pj_list empty_slot_list; + pj_lock_t *list_lock; /* list is not thread safe, lock required*/ + slot_data_list slots_list[MAX_SLOTS]; /**< Array of useful information "slots" (file players, for example).*/ + + int retcode; /* test retcode. non-zero will abort. */ + } state; +} stack_test_desc; + +static int stack_stress_test_init(stack_test_desc* test); +static int stack_stress_test_destroy(stack_test_desc* test); +static int stack_worker_thread(stack_test_desc* test); + +static int list_stress_test_init(stack_test_desc* test); +static int list_stress_test_destroy(stack_test_desc* test); +static int list_worker_thread(stack_test_desc* test); + +static int stack_stress_test(stack_test_desc* test); +static int worker_thread(void* p); + +static stack_test_desc tests[] = { + { + .cfg.title = "stack (single thread)", + .cfg.n_threads = 0, + .cfg.repeat = 10000, + .cfg.test_init = &stack_stress_test_init, + .cfg.test_destroy = &stack_stress_test_destroy, + .cfg.worker_thread = &stack_worker_thread + }, + { + .cfg.title = "list (single thread)", + .cfg.n_threads = 0, + .cfg.repeat = 10000, + .cfg.test_init = &list_stress_test_init, + .cfg.test_destroy = &list_stress_test_destroy, + .cfg.worker_thread = &list_worker_thread + }, + { + .cfg.title = "stack (multithread thread)", + .cfg.n_threads = 16, + .cfg.repeat = 10000, + .cfg.test_init = &stack_stress_test_init, + .cfg.test_destroy = &stack_stress_test_destroy, + .cfg.worker_thread = &stack_worker_thread + }, + { + .cfg.title = "list (multithread thread)", + .cfg.n_threads = 16, + .cfg.repeat = 10000, + .cfg.test_init = &list_stress_test_init, + .cfg.test_destroy = &list_stress_test_destroy, + .cfg.worker_thread = &list_worker_thread + } +}; + int stack_test() { pj_stack_type *stack = NULL; @@ -139,12 +240,277 @@ int stack_test() rc = -55; } + for (i = 0; !rc && i < PJ_ARRAY_SIZE(tests); ++i) { + tests[i].state.pool = pool; + rc = stack_stress_test(&tests[i]); + } + if (pool) pj_pool_release(pool); return rc; } +/* + * This test illustrates: + * 1) a multi-threaded use case for the pj_stack API + * 2) a useful idea: reserving an empty slot in a large array without having to lock the entire array + * 3) pj_stack performance on Windows is 2-3x higher than pj_list with pj_simple_mutex_lock + */ +static int stack_stress_test(stack_test_desc* test) { + unsigned i; + pj_status_t status; + pj_timestamp t1, t2; + int rc; + + TRACE((THIS_FILE, "%s", test->cfg.title)); + int ident = pj_log_get_indent(); /* worker_thread change ident on this thread */ + pj_log_push_indent(); + + rc = (*test->cfg.test_init)(test); + if (rc) + return rc; + + pj_get_timestamp(&t1); + + if (test->cfg.n_threads == 0) + worker_thread(test); + else { + unsigned n_threads = test->cfg.n_threads; + pj_thread_t* threads[MAX_THREADS]; + + for (i = 0; i < n_threads; ++i) { + status = pj_thread_create(test->state.pool, "stack_stress_test", + &worker_thread, test, + 0, PJ_THREAD_SUSPENDED, + &threads[i]); + if (status != PJ_SUCCESS) { + PJ_PERROR(1, (THIS_FILE, status, "Unable to create thread")); + return -70; + } + } + + for (i = 0; i < n_threads; ++i) { + status = pj_thread_resume(threads[i]); + if (status != PJ_SUCCESS) { + PJ_PERROR(1, (THIS_FILE, status, "Unable to resume thread")); + return -75; + } + } + + worker_thread(test); + + for (i = 0; i < n_threads; ++i) { + pj_thread_join(threads[i]); + pj_thread_destroy(threads[i]); + } + } + + rc = (*test->cfg.test_destroy)(test); + if (rc) + return rc; + + pj_get_timestamp(&t2); + + TRACE((THIS_FILE, "time: %d ms", pj_elapsed_msec(&t1, &t2))); + + pj_log_set_indent(ident); /* restore ident changed by worker_thread() instead of pj_log_pop_indent() */ + return test->state.retcode; + +} + +static int stack_stress_test_init(stack_test_desc* test) { + pj_status_t status; + status = pj_stack_create(test->state.pool, &test->state.empty_slot_stack); + if (status != PJ_SUCCESS) { + PJ_PERROR(1, (THIS_FILE, status, "Unable to create stack")); + return -60; + } + slot_data* p; + for (p = test->state.slots + PJ_ARRAY_SIZE(test->state.slots) - 1; p > test->state.slots - 1; --p) { + if ((status = pj_stack_push(test->state.empty_slot_stack, p)) != PJ_SUCCESS) { + PJ_PERROR(1, (THIS_FILE, status, "Unable to init stack")); + return -65; + } + } + return 0; +} + +static int stack_stress_test_destroy(stack_test_desc* test) { + pj_status_t status; + status = pj_stack_destroy(test->state.empty_slot_stack); + if (status != PJ_SUCCESS) { + PJ_PERROR(1, (THIS_FILE, status, "Unable to destroy stack")); + return -80; + } + return 0; +} + +static int list_stress_test_init(stack_test_desc* test) { + pj_status_t status; + + pj_list_init(&test->state.empty_slot_list); + + slot_data_list *p; + for (p = test->state.slots_list + PJ_ARRAY_SIZE(test->state.slots_list) - 1; p > test->state.slots_list - 1; --p) { + pj_list_push_back(&test->state.empty_slot_list, p); + } + status = pj_lock_create_simple_mutex(test->state.pool, "stress_test_list_lock", &test->state.list_lock); + if (status != PJ_SUCCESS) { + PJ_PERROR(1, (THIS_FILE, status, "Unable to create simple mutex lock")); + return -67; + } + return 0; +} + +static int list_stress_test_destroy(stack_test_desc* test) { + pj_status_t status; + status = pj_lock_destroy(test->state.list_lock); + if (status != PJ_SUCCESS) { + PJ_PERROR(1, (THIS_FILE, status, "Unable to destroy simple mutex lock")); + return -77; + } + return 0; +} + +/* worker thread */ +static int worker_thread(void* p) { + stack_test_desc* test = (stack_test_desc*)p; + return (*test->cfg.worker_thread)(test); +} + +static int stack_worker_thread(stack_test_desc* test) +{ + unsigned n_events = 0; + unsigned reserved_slots[MAX_RESERVED]; + unsigned reserved_count = 0; + unsigned slot_id; + + pj_bzero(reserved_slots, sizeof(reserved_slots)); + + /* log indent is not propagated to other threads, + * so we set it explicitly here + */ + pj_log_set_indent(3); + + while (test->state.retcode == 0 && n_events < test->cfg.repeat) { + slot_data* slot = pj_stack_pop(test->state.empty_slot_stack); + if (slot != NULL) { /* we have got an empty slot */ + if (slot->owner != NULL) { + PJ_LOG(1, (THIS_FILE, "Reserved slot is not empty")); + test->state.retcode = -90; + break; + } + else { + slot->owner = pj_thread_this(); /* slot reserved successfully */ + slot_id = slot - test->state.slots; + reserved_slots[reserved_count++] = slot_id; + ++n_events; + } + } + if (slot == NULL || /* no empty slots at all or */ + reserved_count >= MAX_RESERVED) { /* this thread has reserved the maximum number of slots allowed */ + while (reserved_count) { /* clear slots reserved here */ + slot_id = reserved_slots[--reserved_count]; + slot = &test->state.slots[slot_id]; + if (slot->owner != pj_thread_this()) { + PJ_LOG(1, (THIS_FILE, "Anothed thread has reserved this thread's slot")); + test->state.retcode = -85; + } + else if (slot->owner == NULL) { + PJ_LOG(1, (THIS_FILE, "Anothed thread has freed up this thread's slot")); + test->state.retcode = -95; + } + else { + slot->owner = NULL; /* free up slot before returning */ + pj_stack_push(test->state.empty_slot_stack, slot); /* slot returned to empty slot's stack */ + } + } + } + + } + + TRACE((THIS_FILE, "thread exiting, n_events=%d", n_events)); + return 0; +} + +static int list_worker_thread(stack_test_desc* test) { + unsigned n_events = 0; + unsigned reserved_slots[MAX_RESERVED]; + unsigned reserved_count = 0; + unsigned slot_id; + pj_status_t status; + + pj_bzero(reserved_slots, sizeof(reserved_slots)); + + /* log indent is not propagated to other threads, + * so we set it explicitly here + */ + pj_log_set_indent(3); + + while (test->state.retcode == 0 && n_events < test->cfg.repeat) { + status = pj_lock_acquire(test->state.list_lock); + if (status != PJ_SUCCESS) { + PJ_PERROR(1, (THIS_FILE, status, "Unable to acquire lock")); + return -78; + } + slot_data_list* slot = test->state.empty_slot_list.next; + pj_list_erase(slot); + status = pj_lock_release(test->state.list_lock); + if (status != PJ_SUCCESS) { + PJ_PERROR(1, (THIS_FILE, status, "Unable to release lock")); + return -79; + } + if (slot != NULL) { /* we have got an empty slot */ + if (slot->owner != NULL) { + PJ_LOG(1, (THIS_FILE, "Reserved slot is not empty")); + test->state.retcode = -86; + break; + } + else { + slot->owner = pj_thread_this(); /* slot reserved successfully */ + slot_id = slot - test->state.slots_list; + reserved_slots[reserved_count++] = slot_id; + ++n_events; + } + } + if (slot == NULL || /* no empty slots at all or */ + reserved_count >= MAX_RESERVED) { /* this thread has reserved the maximum number of slots allowed */ + while (reserved_count) { /* clear slots reserved here */ + slot_id = reserved_slots[--reserved_count]; + slot = &test->state.slots_list[slot_id]; + if (slot->owner != pj_thread_this()) { + PJ_LOG(1, (THIS_FILE, "Anothed thread has reserved this thread's slot")); + test->state.retcode = -84; + } + else if (slot->owner == NULL) { + PJ_LOG(1, (THIS_FILE, "Anothed thread has freed up this thread's slot")); + test->state.retcode = -83; + } + else { + slot->owner = NULL; /* free up slot before returning */ + status = pj_lock_acquire(test->state.list_lock); + if (status != PJ_SUCCESS) { + PJ_PERROR(1, (THIS_FILE, status, "Unable to acquire lock")); + return -81; + } + pj_list_push_back(&test->state.empty_slot_list, slot); /* slot returned to empty slot's stack */ + status = pj_lock_release(test->state.list_lock); + if (status != PJ_SUCCESS) { + PJ_PERROR(1, (THIS_FILE, status, "Unable to release lock")); + return -82; + } + + } + } + } + + } + + TRACE((THIS_FILE, "thread exiting, n_events=%d", n_events)); + return 0; +} + #else /* To prevent warning about "translation unit is empty" * when this test is disabled. From 246a20a9fa7c4c85dc3efecec6cb46e7e6f7081d Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Thu, 28 Nov 2024 23:55:16 +0100 Subject: [PATCH 18/33] fix pj_stack multithreading for non-windows platforms --- pjlib/src/pj/stack.c | 20 +++++++-------- pjlib/src/pjlib-test/stack.c | 49 +++++++++++++++++++++++------------- 2 files changed, 40 insertions(+), 29 deletions(-) diff --git a/pjlib/src/pj/stack.c b/pjlib/src/pj/stack.c index 28da622e81..2ade7f3ca4 100644 --- a/pjlib/src/pj/stack.c +++ b/pjlib/src/pj/stack.c @@ -101,20 +101,18 @@ PJ_DEF(pj_stack_t*) pj_stack_pop(pj_stack_type *stack) return NULL; } - pj_stack_item_t* node = stack->head.next; - stack->head.next = node->next; - - if ((status = pj_mutex_unlock(stack->mutex)) != PJ_SUCCESS) - { - PJ_PERROR(1, ("pj_stack_pop", status, "Error unlocking mutex for stack stc%p", stack)); - } - if (node != node->next) - { + pj_stack_item_t *node = stack->head.next; + if (node != &stack->head) { + stack->head.next = node->next; node->next = NULL; - return node; } else - return NULL; + node = NULL; + + if ((status = pj_mutex_unlock(stack->mutex)) != PJ_SUCCESS) + PJ_PERROR(1, ("pj_stack_pop", status, "Error unlocking mutex for stack stc%p", stack)); + + return node; } diff --git a/pjlib/src/pjlib-test/stack.c b/pjlib/src/pjlib-test/stack.c index 94182445a6..ea728223eb 100644 --- a/pjlib/src/pjlib-test/stack.c +++ b/pjlib/src/pjlib-test/stack.c @@ -73,8 +73,6 @@ typedef struct stack_test_desc { int (*test_init)(stack_test_desc *test); int (*test_destroy)(stack_test_desc *test); - //slot_data *(*reserve_slot)(stack_test_desc* test); - //void (*release_slot)(stack_test_desc* test, slot_data* slot); int (*worker_thread)(stack_test_desc* test); } cfg; @@ -107,35 +105,45 @@ static stack_test_desc tests[] = { { .cfg.title = "stack (single thread)", .cfg.n_threads = 0, - .cfg.repeat = 10000, + .cfg.repeat = 1000000, .cfg.test_init = &stack_stress_test_init, .cfg.test_destroy = &stack_stress_test_destroy, .cfg.worker_thread = &stack_worker_thread }, +#ifdef PJ_WIN32 + /* for other platforms, the stack implementation has no performance advantage + * over the list + */ { .cfg.title = "list (single thread)", .cfg.n_threads = 0, - .cfg.repeat = 10000, + .cfg.repeat = 1000000, .cfg.test_init = &list_stress_test_init, .cfg.test_destroy = &list_stress_test_destroy, .cfg.worker_thread = &list_worker_thread }, +#endif { .cfg.title = "stack (multithread thread)", .cfg.n_threads = 16, - .cfg.repeat = 10000, + .cfg.repeat = 1000000, .cfg.test_init = &stack_stress_test_init, .cfg.test_destroy = &stack_stress_test_destroy, .cfg.worker_thread = &stack_worker_thread }, +#ifdef PJ_WIN32 + /* for other platforms, the stack implementation has no performance advantage + * over the list + */ { .cfg.title = "list (multithread thread)", .cfg.n_threads = 16, - .cfg.repeat = 10000, + .cfg.repeat = 1000000, .cfg.test_init = &list_stress_test_init, .cfg.test_destroy = &list_stress_test_destroy, .cfg.worker_thread = &list_worker_thread } +#endif }; int stack_test() @@ -222,10 +230,8 @@ int stack_test() --i; pj_assert(p->value == i); //FILO ! if (p->value != i || p != nodes + i) { - { - rc = -40; - goto error; - } + rc = -40; + goto error; } } if (i) @@ -409,8 +415,9 @@ static int stack_worker_thread(stack_test_desc* test) } } if (slot == NULL || /* no empty slots at all or */ - reserved_count >= MAX_RESERVED) { /* this thread has reserved the maximum number of slots allowed */ - while (reserved_count) { /* clear slots reserved here */ + reserved_count >= MAX_RESERVED || /* this thread has reserved the maximum number of slots allowed */ + n_events >= test->cfg.repeat) { /* or test completed */ + while (reserved_count) { /* clear slots reserved here */ slot_id = reserved_slots[--reserved_count]; slot = &test->state.slots[slot_id]; if (slot->owner != pj_thread_this()) { @@ -420,7 +427,7 @@ static int stack_worker_thread(stack_test_desc* test) else if (slot->owner == NULL) { PJ_LOG(1, (THIS_FILE, "Anothed thread has freed up this thread's slot")); test->state.retcode = -95; - } + } else { slot->owner = NULL; /* free up slot before returning */ pj_stack_push(test->state.empty_slot_stack, slot); /* slot returned to empty slot's stack */ @@ -454,8 +461,13 @@ static int list_worker_thread(stack_test_desc* test) { PJ_PERROR(1, (THIS_FILE, status, "Unable to acquire lock")); return -78; } + slot_data_list* slot = test->state.empty_slot_list.next; - pj_list_erase(slot); + if (!pj_list_empty(slot)) + pj_list_erase(slot); + else + slot = NULL; + status = pj_lock_release(test->state.list_lock); if (status != PJ_SUCCESS) { PJ_PERROR(1, (THIS_FILE, status, "Unable to release lock")); @@ -466,17 +478,18 @@ static int list_worker_thread(stack_test_desc* test) { PJ_LOG(1, (THIS_FILE, "Reserved slot is not empty")); test->state.retcode = -86; break; - } - else { + } else { slot->owner = pj_thread_this(); /* slot reserved successfully */ slot_id = slot - test->state.slots_list; reserved_slots[reserved_count++] = slot_id; ++n_events; + } } if (slot == NULL || /* no empty slots at all or */ - reserved_count >= MAX_RESERVED) { /* this thread has reserved the maximum number of slots allowed */ - while (reserved_count) { /* clear slots reserved here */ + reserved_count >= MAX_RESERVED || /* this thread has reserved the maximum number of slots allowed */ + n_events >= test->cfg.repeat) { /* or test completed */ + while (reserved_count) { /* clear slots reserved here */ slot_id = reserved_slots[--reserved_count]; slot = &test->state.slots_list[slot_id]; if (slot->owner != pj_thread_this()) { From 5db76f65ba4dee0da8928f1e8771bc7eb78df7a2 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Fri, 29 Nov 2024 17:41:31 +0100 Subject: [PATCH 19/33] stack tests decreased the repeat counter increased the number of threads --- pjlib/src/pjlib-test/stack.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pjlib/src/pjlib-test/stack.c b/pjlib/src/pjlib-test/stack.c index ea728223eb..4b938b3e34 100644 --- a/pjlib/src/pjlib-test/stack.c +++ b/pjlib/src/pjlib-test/stack.c @@ -33,9 +33,10 @@ #endif // PJ_WIN32 #define THIS_FILE "stack.c" -#define MAX_THREADS 16 +#define MAX_THREADS 32 #define MAX_RESERVED 16 #define MAX_SLOTS 100 +#define MAX_REPEATS 100000 #define TRACE(log) PJ_LOG(3,log) @@ -105,7 +106,7 @@ static stack_test_desc tests[] = { { .cfg.title = "stack (single thread)", .cfg.n_threads = 0, - .cfg.repeat = 1000000, + .cfg.repeat = MAX_REPEATS, .cfg.test_init = &stack_stress_test_init, .cfg.test_destroy = &stack_stress_test_destroy, .cfg.worker_thread = &stack_worker_thread @@ -117,16 +118,16 @@ static stack_test_desc tests[] = { { .cfg.title = "list (single thread)", .cfg.n_threads = 0, - .cfg.repeat = 1000000, + .cfg.repeat = MAX_REPEATS, .cfg.test_init = &list_stress_test_init, .cfg.test_destroy = &list_stress_test_destroy, .cfg.worker_thread = &list_worker_thread }, #endif { - .cfg.title = "stack (multithread thread)", - .cfg.n_threads = 16, - .cfg.repeat = 1000000, + .cfg.title = "stack (multi threads)", + .cfg.n_threads = MAX_THREADS, + .cfg.repeat = MAX_REPEATS, .cfg.test_init = &stack_stress_test_init, .cfg.test_destroy = &stack_stress_test_destroy, .cfg.worker_thread = &stack_worker_thread @@ -136,9 +137,9 @@ static stack_test_desc tests[] = { * over the list */ { - .cfg.title = "list (multithread thread)", - .cfg.n_threads = 16, - .cfg.repeat = 1000000, + .cfg.title = "list (multi threads)", + .cfg.n_threads = MAX_THREADS, + .cfg.repeat = MAX_REPEATS, .cfg.test_init = &list_stress_test_init, .cfg.test_destroy = &list_stress_test_destroy, .cfg.worker_thread = &list_worker_thread @@ -312,13 +313,13 @@ static int stack_stress_test(stack_test_desc* test) { } } + pj_get_timestamp(&t2); + rc = (*test->cfg.test_destroy)(test); if (rc) return rc; - pj_get_timestamp(&t2); - - TRACE((THIS_FILE, "time: %d ms", pj_elapsed_msec(&t1, &t2))); + TRACE((THIS_FILE, "%s time: %d ms", test->cfg.title, pj_elapsed_msec(&t1, &t2))); pj_log_set_indent(ident); /* restore ident changed by worker_thread() instead of pj_log_pop_indent() */ return test->state.retcode; From 37f4a8af843a1241b1b5cb6cb09d4c7a70ee183c Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Fri, 29 Nov 2024 23:00:00 +0100 Subject: [PATCH 20/33] stack tests optimized --- pjlib/src/pjlib-test/stack.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pjlib/src/pjlib-test/stack.c b/pjlib/src/pjlib-test/stack.c index 4b938b3e34..d63cb21503 100644 --- a/pjlib/src/pjlib-test/stack.c +++ b/pjlib/src/pjlib-test/stack.c @@ -33,10 +33,19 @@ #endif // PJ_WIN32 #define THIS_FILE "stack.c" -#define MAX_THREADS 32 #define MAX_RESERVED 16 #define MAX_SLOTS 100 -#define MAX_REPEATS 100000 + +#ifdef PJ_WIN32 +# define MAX_THREADS 32 +# define MAX_REPEATS 100000 +#else + /* for other platforms, the stack implementation has no performance advantage + * over the list. There is no point in waiting long. + */ +# define MAX_THREADS 2 +# define MAX_REPEATS 1000 +#endif // PJ_WIN32 #define TRACE(log) PJ_LOG(3,log) @@ -262,7 +271,7 @@ int stack_test() * This test illustrates: * 1) a multi-threaded use case for the pj_stack API * 2) a useful idea: reserving an empty slot in a large array without having to lock the entire array - * 3) pj_stack performance on Windows is 2-3x higher than pj_list with pj_simple_mutex_lock + * 3) pj_stack performance on Windows is 2-5x higher than pj_list with pj_simple_mutex_lock */ static int stack_stress_test(stack_test_desc* test) { unsigned i; From abbad93c0a1b3f45bc3557002eeb4c700ae3dd1f Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Sun, 8 Dec 2024 22:56:53 +0100 Subject: [PATCH 21/33] simplified pj_stack impl --- aconfigure | 4 +- aconfigure.ac | 4 +- pjlib/build/Makefile | 2 +- pjlib/build/os-darwinos.mak | 2 - pjlib/build/os-linux.mak | 2 - pjlib/build/os-rtems.mak | 2 - pjlib/build/os-sunos.mak | 2 - pjlib/build/os-win32.mak | 3 +- pjlib/build/pjlib.vcxproj | 4 +- pjlib/include/pj/compat/cc_gcc.h | 11 +- pjlib/include/pj/compat/cc_msvc.h | 38 +---- pjlib/include/pj/compat/os_win32.h | 25 ---- pjlib/include/pj/compat/os_winuwp.h | 14 -- pjlib/include/pj/config.h | 8 - pjlib/include/pj/stack.h | 96 ++++++++++-- pjlib/src/pj/stack.c | 14 +- pjlib/src/pj/stack_win32.c | 40 ++++- pjlib/src/pjlib-test/stack.c | 217 +++------------------------- 18 files changed, 170 insertions(+), 318 deletions(-) diff --git a/aconfigure b/aconfigure index c917b6643d..b5d3446319 100755 --- a/aconfigure +++ b/aconfigure @@ -6942,10 +6942,10 @@ fi case $target in *mingw* | *cygw* | *win32* | *w32* ) - ac_os_objs="$ac_os_objs file_access_win32.o file_io_win32.o os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o sock_qos_bsd.o unicode_win32.o stack_win32.o" + ac_os_objs="$ac_os_objs file_access_win32.o file_io_win32.o os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o sock_qos_bsd.o unicode_win32.o" ;; *) - ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o stack.o" + ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o" case $target in *-apple-darwin_ios*) ac_os_objs="$ac_os_objs os_info_iphone.o os_core_darwin.o" diff --git a/aconfigure.ac b/aconfigure.ac index 8380210b49..279870e9d6 100644 --- a/aconfigure.ac +++ b/aconfigure.ac @@ -643,10 +643,10 @@ dnl # OS specific files dnl # case $target in *mingw* | *cygw* | *win32* | *w32* ) - ac_os_objs="$ac_os_objs file_access_win32.o file_io_win32.o os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o sock_qos_bsd.o unicode_win32.o stack_win32.o" + ac_os_objs="$ac_os_objs file_access_win32.o file_io_win32.o os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o sock_qos_bsd.o unicode_win32.o" ;; *) - ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o stack.o" + ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o" case $target in *-apple-darwin_ios*) ac_os_objs="$ac_os_objs os_info_iphone.o os_core_darwin.o" diff --git a/pjlib/build/Makefile b/pjlib/build/Makefile index 490a7efa78..b8d182b064 100644 --- a/pjlib/build/Makefile +++ b/pjlib/build/Makefile @@ -36,7 +36,7 @@ export PJLIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ os_time_common.o os_info.o pool.o pool_buf.o pool_caching.o pool_dbg.o \ rand.o rbtree.o sock_common.o sock_qos_common.o \ ssl_sock_common.o ssl_sock_ossl.o ssl_sock_gtls.o ssl_sock_dump.o \ - ssl_sock_darwin.o string.o timer.o types.o unittest.o + ssl_sock_darwin.o stack.o string.o timer.o types.o unittest.o export PJLIB_CFLAGS += $(_CFLAGS) export PJLIB_CXXFLAGS += $(_CXXFLAGS) export PJLIB_LDFLAGS += $(_LDFLAGS) diff --git a/pjlib/build/os-darwinos.mak b/pjlib/build/os-darwinos.mak index 3a55f18e3e..931a9bdc9a 100644 --- a/pjlib/build/os-darwinos.mak +++ b/pjlib/build/os-darwinos.mak @@ -13,8 +13,6 @@ export PJLIB_OBJS += addr_resolv_sock.o guid_simple.o \ os_timestamp_common.o os_timestamp_posix.o \ pool_policy_malloc.o sock_bsd.o sock_select.o -export PJLIB_OBJS += stack.o - export PJLIB_OBJS += ioqueue_select.o #export PJLIB_OBJS += ioqueue_epoll.o diff --git a/pjlib/build/os-linux.mak b/pjlib/build/os-linux.mak index 34b437b651..048b1ab1ab 100644 --- a/pjlib/build/os-linux.mak +++ b/pjlib/build/os-linux.mak @@ -14,8 +14,6 @@ export PJLIB_OBJS += addr_resolv_sock.o file_access_unistd.o \ os_timestamp_common.o os_timestamp_posix.o \ pool_policy_malloc.o sock_bsd.o sock_select.o -export PJLIB_OBJS += stack.o - ifeq (epoll,$(LINUX_POLL)) export PJLIB_OBJS += ioqueue_epoll.o else diff --git a/pjlib/build/os-rtems.mak b/pjlib/build/os-rtems.mak index 0695a12d31..ebc509f42f 100644 --- a/pjlib/build/os-rtems.mak +++ b/pjlib/build/os-rtems.mak @@ -16,8 +16,6 @@ export PJLIB_OBJS += addr_resolv_sock.o guid_simple.o \ os_timestamp_common.o os_timestamp_posix.o \ pool_policy_malloc.o sock_bsd.o sock_select.o -export PJLIB_OBJS += stack.o - export PJLIB_OBJS += ioqueue_select.o export PJLIB_OBJS += file_access_unistd.o file_io_ansi.o export PJLIB_OBJS += sock_qos_bsd.o diff --git a/pjlib/build/os-sunos.mak b/pjlib/build/os-sunos.mak index f2b0d3deb9..f3bffaa973 100644 --- a/pjlib/build/os-sunos.mak +++ b/pjlib/build/os-sunos.mak @@ -14,8 +14,6 @@ export PJLIB_OBJS += addr_resolv_sock.o file_access_unistd.o \ os_timestamp_common.o os_timestamp_posix.o \ pool_policy_malloc.o sock_bsd.o sock_select.o -export PJLIB_OBJS += stack.o - export PJLIB_OBJS += ioqueue_select.o #export PJLIB_OBJS += ioqueue_epoll.o diff --git a/pjlib/build/os-win32.mak b/pjlib/build/os-win32.mak index 2feb0834ba..9eb1191f8f 100644 --- a/pjlib/build/os-win32.mak +++ b/pjlib/build/os-win32.mak @@ -11,8 +11,7 @@ export PJLIB_OBJS += addr_resolv_sock.o guid_win32.o unicode_win32.o \ log_writer_stdout.o os_core_win32.o \ os_error_win32.o os_time_bsd.o os_timestamp_common.o \ os_timestamp_win32.o \ - pool_policy_malloc.o sock_bsd.o sock_select.o \ - stack_win32.o + pool_policy_malloc.o sock_bsd.o sock_select.o #export PJLIB_OBJS += ioqueue_winnt.o export PJLIB_OBJS += ioqueue_select.o diff --git a/pjlib/build/pjlib.vcxproj b/pjlib/build/pjlib.vcxproj index 04c4ec4add..215766931e 100644 --- a/pjlib/build/pjlib.vcxproj +++ b/pjlib/build/pjlib.vcxproj @@ -999,7 +999,8 @@ - + + true true true @@ -1025,7 +1026,6 @@ true true - true diff --git a/pjlib/include/pj/compat/cc_gcc.h b/pjlib/include/pj/compat/cc_gcc.h index 7f8ae66d37..6c562f41ed 100644 --- a/pjlib/include/pj/compat/cc_gcc.h +++ b/pjlib/include/pj/compat/cc_gcc.h @@ -72,13 +72,18 @@ #define PJ_UNREACHED(x) +/* +* Usage example: +* +* typedef struct PJ_ALIGN_DATA_PREFIX(8) a { int value; } PJ_ALIGN_DATA_SUFFIX(8) a; +* typedef struct PJ_ALIGN_DATA(a{ int value; }, 8) a; +* +* Both options are equivalent, but perhaps the first is a little more readable than the second. +*/ //#define PJ_ALIGN_DATA(declaration, alignment) declaration __attribute__((aligned (alignment))) #define PJ_ALIGN_DATA_PREFIX(alignment) #define PJ_ALIGN_DATA_SUFFIX(alignment) __attribute__((aligned (alignment))) #define PJ_ALIGN_DATA(declaration, alignment) PJ_ALIGN_DATA_PREFIX(alignment) declaration PJ_ALIGN_DATA_SUFFIX(alignment) -#define PJ_SYS_ALIGN_PREFIX -#define PJ_SYS_ALIGN_SUFFIX - #endif /* __PJ_COMPAT_CC_GCC_H__ */ diff --git a/pjlib/include/pj/compat/cc_msvc.h b/pjlib/include/pj/compat/cc_msvc.h index 51af62623c..0ab1ce72a8 100644 --- a/pjlib/include/pj/compat/cc_msvc.h +++ b/pjlib/include/pj/compat/cc_msvc.h @@ -81,15 +81,12 @@ typedef unsigned __int64 pj_uint64_t; #define PJ_UNREACHED(x) /* - * Standard pjsip macro is not well human readable for use with structures: - * typedef struct PJ_ALIGN_DATA(a{ int value; }, 8) a; - * - * The macros PJ_ALIGN_DATA_PREFIX and PJ_ALIGN_DATA_SUFFIX give us a more readable equivalent syntax: - * typedef struct PJ_ALIGN_DATA_PREFIX(8) a { int value; } PJ_ALIGN_DATA_SUFFIX(8) a; - * - * and PJ_SYS_ALIGN_PREFIX, PJ_SYS_ALIGN_SUFFIX give us an even more readable syntax with the - * platform default alignment: - * typedef struct PJ_SYS_ALIGN_PREFIX a { int value; } PJ_SYS_ALIGN_SUFFIX a; +* Usage example: +* +* typedef struct PJ_ALIGN_DATA_PREFIX(8) a { int value; } PJ_ALIGN_DATA_SUFFIX(8) a; +* typedef struct PJ_ALIGN_DATA(a{ int value; }, 8) a; +* +* Both options are equivalent, but perhaps the first is a little more readable than the second. */ //#define PJ_ALIGN_DATA(declaration, alignment) __declspec(align(alignment)) declaration //#pragma warning(disable:4324) // structure padded due to align() @@ -98,28 +95,5 @@ typedef unsigned __int64 pj_uint64_t; #define PJ_ALIGN_DATA_SUFFIX(alignment) __pragma(warning(pop)) #define PJ_ALIGN_DATA(declaration, alignment) PJ_ALIGN_DATA_PREFIX(alignment) declaration PJ_ALIGN_DATA_SUFFIX(alignment) - -/* - * PJ_SYS_ALIGN_PREFIX, PJ_SYS_ALIGN_SUFFIX is a readable syntax to use with the - * platform default alignment (see example above). - * The MEMORY_ALLOCATION_ALIGNMENT macro which is 16 on the x64 platform and 8 on the x86 platform - * is the platform default alignment for the Windows platform and is set in winnt.h. - * But it is too early to use MEMORY_ALLOCATION_ALIGNMENT constant here - * so we need to explicity declare alignment as 8 or 16. - */ -#if defined(MEMORY_ALLOCATION_ALIGNMENT) -# define PJ_SYS_ALIGN_PREFIX PJ_ALIGN_DATA_PREFIX(MEMORY_ALLOCATION_ALIGNMENT) -# define PJ_SYS_ALIGN_SUFFIX PJ_ALIGN_DATA_SUFFIX(MEMORY_ALLOCATION_ALIGNMENT) -#elif defined(_WIN64) || defined(_M_ALPHA) -# define PJ_SYS_ALIGN_PREFIX PJ_ALIGN_DATA_PREFIX(16) -# define PJ_SYS_ALIGN_SUFFIX PJ_ALIGN_DATA_SUFFIX(16) -#else -# define PJ_SYS_ALIGN_PREFIX PJ_ALIGN_DATA_PREFIX(8) -# define PJ_SYS_ALIGN_SUFFIX PJ_ALIGN_DATA_SUFFIX(8) -#endif - - - - #endif /* __PJ_COMPAT_CC_MSVC_H__ */ diff --git a/pjlib/include/pj/compat/os_win32.h b/pjlib/include/pj/compat/os_win32.h index caab198672..78c47fd3ec 100644 --- a/pjlib/include/pj/compat/os_win32.h +++ b/pjlib/include/pj/compat/os_win32.h @@ -148,30 +148,5 @@ # endif #endif - -/* - * winnt.h define MEMORY_ALLOCATION_ALIGNMENT as 8 for x86, ARM, ARM64 and 16 for x64 and ARM64EC. - * see winnt.h - * - * We need to define PJ_POOL_ALIGNMENT as MEMORY_ALLOCATION_ALIGNMENT for the Windows platform to - * dynamicaly allocate memory used by some Windows APIs. - * For example the pj_stack implementation and possibly some other implemented APIs require and check - * that PJ_POOL_ALIGNMENT is at least equal to MEMORY_ALLOCATION_ALIGNMENT, - * which is 16 on the x64 platform and 8 on the x86 platform. - * - * But it is too early to use MEMORY_ALLOCATION_ALIGNMENT constant here - * so we need to explicity declare PJ_POOL_ALIGNMENT as 8 or 16, as opposed to - * pjsip's default of 4 - see pool.h - */ -#if defined(MEMORY_ALLOCATION_ALIGNMENT) -# define PJ_POOL_ALIGNMENT MEMORY_ALLOCATION_ALIGNMENT -#elif defined(_WIN64) || defined(_M_ALPHA) - //#elif defined(_WIN64) || defined(WIN64) -# define PJ_POOL_ALIGNMENT 16 -#else -# define PJ_POOL_ALIGNMENT 8 -#endif - - #endif /* __PJ_COMPAT_OS_WIN32_H__ */ diff --git a/pjlib/include/pj/compat/os_winuwp.h b/pjlib/include/pj/compat/os_winuwp.h index dd3dbc9765..b75219af5b 100644 --- a/pjlib/include/pj/compat/os_winuwp.h +++ b/pjlib/include/pj/compat/os_winuwp.h @@ -145,18 +145,4 @@ */ #define PJ_THREAD_ALLOCATE_STACK 0 -/* - * We need to define PJ_POOL_ALIGNMENT as MEMORY_ALLOCATION_ALIGNMENT for the Windows platform. - * see winnt.h for MEMORY_ALLOCATION_ALIGNMENT - * see more in os_win32.h - */ -#if defined(MEMORY_ALLOCATION_ALIGNMENT) -# define PJ_POOL_ALIGNMENT MEMORY_ALLOCATION_ALIGNMENT -#elif defined(_WIN64) || defined(_M_ALPHA) - //#elif defined(_WIN64) || defined(WIN64) -# define PJ_POOL_ALIGNMENT 16 -#else -# define PJ_POOL_ALIGNMENT 8 -#endif - #endif /* __PJ_COMPAT_OS_UWP_H__ */ diff --git a/pjlib/include/pj/config.h b/pjlib/include/pj/config.h index e4d0cafd52..49ff05ba32 100644 --- a/pjlib/include/pj/config.h +++ b/pjlib/include/pj/config.h @@ -51,14 +51,6 @@ # error "PJ_ALIGN_DATA is not defined!" #endif -#ifndef PJ_SYS_ALIGN_PREFIX -# define PJ_SYS_ALIGN_PREFIX -#endif - -#ifndef PJ_SYS_ALIGN_SUFFIX -# define PJ_SYS_ALIGN_SUFFIX -#endif - /******************************************************************** * Include target OS specific configuration. */ diff --git a/pjlib/include/pj/stack.h b/pjlib/include/pj/stack.h index ef83fb0e56..ce7465304a 100644 --- a/pjlib/include/pj/stack.h +++ b/pjlib/include/pj/stack.h @@ -8,6 +8,53 @@ #include +/** + * Specify if compiler should use crossplatform stack implementation + * even if this compilation is for Windows platform. + * The performance of pj_stack implementation for Windows platform is 2-5x higher than cross-platform. + * + * To use the implementation on the Windows platform, some prerequisites must be met: + * - this should be compiling for Windows platform + * - add #define PJ_USE_CROSSPLATFORM_STACK_IMPL 0 + * to your config_site.h + * - PJ_POOL_ALIGNMENT should be defined in config_site.h and not less then MEMORY_ALLOCATION_ALIGNMENT + * The MEMORY_ALLOCATION_ALIGNMENT macro which is 16 on the x64 platform and 8 on the x86 platform + * is the platform default alignment for the Windows platform and is set in winnt.h. + * + * + * Default: 1 (crossplatform) + * + * 0 - use the Windows platform stack implementation + * 1 - force the crossplatform stack implementation. + */ +#ifndef PJ_USE_CROSSPLATFORM_STACK_IMPL +# define PJ_USE_CROSSPLATFORM_STACK_IMPL 1 +#endif + +#if !PJ_USE_CROSSPLATFORM_STACK_IMPL + +/* the Windows platform stack implementation. */ + +/* + * PJ_STACK_ALIGN_PREFIX, PJ_STACK_ALIGN_SUFFIX is a readable syntax to declare + * platform default alignment for the stack item (see example below). + */ + +# define PJ_STACK_ALIGN_PREFIX PJ_ALIGN_DATA_PREFIX(PJ_POOL_ALIGNMENT) +# define PJ_STACK_ALIGN_SUFFIX PJ_ALIGN_DATA_SUFFIX(PJ_POOL_ALIGNMENT) + +#else // PJ_USE_CROSSPLATFORM_STACK_IMPL != 0 + +/* compilation of crossplatform stack implementation */ + +# define PJ_STACK_ALIGN_PREFIX +# define PJ_STACK_ALIGN_SUFFIX + +#endif + +#include + + PJ_BEGIN_DECL /* @@ -22,9 +69,17 @@ PJ_BEGIN_DECL * Stack in PJLIB is single-linked list with First In Last Out logic. * Stack is thread safe. Common PJLIB stack implementation uses internal locking mechanism so is thread-safe. * Implementation for Windows platform uses locking free Windows embeded single linked list implementation. + * The performance of pj_stack implementation for Windows platform is 2-5x higher than cross-platform. + * * Windows single linked list implementation requires aligned data, both stack item and stack itself should * be aligned by 8 (for x86) or 16 (for x64) byte. We recomend set PJ_POOL_ALIGNMENT macro to corresponding value. * winnt.h define MEMORY_ALLOCATION_ALIGNMENT macro for this purpose. + * To use the implementation on the Windows platform, some prerequisites must be met: + * - this should be compiling for Windows platform + * - add #define PJ_USE_CROSSPLATFORM_STACK_IMPL 0 + * to your config_site.h + * - PJ_POOL_ALIGNMENT should be defined in config_site.h and not less then MEMORY_ALLOCATION_ALIGNMENT + * * Stack won't require dynamic memory allocation (just as all PJLIB data structures). The stack here * should be viewed more like a low level C stack instead of high level C++ stack * (which normally are easier to use but require dynamic memory allocations), @@ -42,9 +97,20 @@ PJ_BEGIN_DECL /** - * Use this macro in the start of the structure declaration to declare that - * the structure can be used in the stack operation. This macro simply - * declares additional member @a next to the structure. + * Use PJ_DECL_STACK_MEMBER macro in the start of the structure declaration to + * declare that the structure can be used in the stack operation. This macro + * simply declares additional member @a next to the structure. + * + * The full declaration of stack item should contain alignment macro + * and may look like this: + * + * typedef struct PJ_STACK_ALIGN_PREFIX stack_node { + * PJ_DECL_STACK_MEMBER(struct stack_node); + * ... + * your data here + * ... + * } PJ_STACK_ALIGN_SUFFIX stack_node; +* * @hideinitializer */ #define PJ_DECL_STACK_MEMBER(type) \ @@ -55,22 +121,22 @@ PJ_BEGIN_DECL /** * Create the stack: allocate memory, allocate and initialize OS resources. * Initially, the stack will have no member, and function pj_stack_pop() will - * always return NULL (which indicates there are no any items in the stack currently) for the newly initialized - * stack. + * always return NULL for the newly initialized stack + * (which indicates there are no any items in the stack currently). * * @param pool Pool to allocate memory from. * @param stack The stack head. * - * @return PJ_SUCCESS or the appropriate error code. + * @return PJ_SUCCESS or the appropriate error code. */ PJ_DECL(pj_status_t) pj_stack_create(pj_pool_t *pool, pj_stack_type **stack); /** * Free OS resources allocated by pj_stack_create(). * - * @param stack The target stack. + * @param stack The target stack. * - * @return PJ_SUCCESS or the appropriate error code. + * @return PJ_SUCCESS or the appropriate error code. */ PJ_DECL(pj_status_t) pj_stack_destroy(pj_stack_type *stack); @@ -78,10 +144,10 @@ PJ_DECL(pj_status_t) pj_stack_destroy(pj_stack_type *stack); /** * Insert (push) the node to the front of the stack as atomic (thread safe) operation. * - * @param stack The stack. - * @param node The element to be inserted. + * @param stack The stack. + * @param node The element to be inserted. * - * @return PJ_SUCCESS or the appropriate error code. + * @return PJ_SUCCESS or the appropriate error code. */ PJ_DECL(pj_status_t) pj_stack_push(pj_stack_type *stack, pj_stack_t *node); @@ -89,7 +155,7 @@ PJ_DECL(pj_status_t) pj_stack_push(pj_stack_type *stack, pj_stack_t *node); /** * Extract (pop) element from the front of the stack (removing it from the stack) as atomic (thread safe) operation. * - * @param stack The target stack. + * @param stack The target stack. * * @return NULL if the stack is empty, or else pointer to element extracted from stack. */ @@ -102,9 +168,9 @@ PJ_DECL(pj_stack_t*) pj_stack_pop(pj_stack_type *stack); * For Windows platform returns the number of entries in the stack modulo 65535. For example, * if the specified stack contains 65536 entries, pj_stack_size returns zero. * - * @param stack The target stack. + * @param stack The target stack. * - * @return Number of elements. + * @return Number of elements. */ PJ_DEF(pj_size_t) pj_stack_size(/*const*/ pj_stack_type *stack); @@ -115,5 +181,5 @@ PJ_DEF(pj_size_t) pj_stack_size(/*const*/ pj_stack_type *stack); PJ_END_DECL -#endif /* __PJ_STACK_H__ */ +#endif /* __PJ_STACK_H__ */ diff --git a/pjlib/src/pj/stack.c b/pjlib/src/pj/stack.c index 2ade7f3ca4..8a5bddf86c 100644 --- a/pjlib/src/pj/stack.c +++ b/pjlib/src/pj/stack.c @@ -5,11 +5,16 @@ #include #include -#ifdef PJ_WIN32 -#error stack.c should NOT be compiled for Windows platform (compile stack_win32.c instead) -#endif // PJ_WIN32 - #include + +#if !PJ_USE_CROSSPLATFORM_STACK_IMPL + + /* Include the Windows platform stack implementation. */ +# include "stack_win32.c" + +#else // PJ_USE_CROSSPLATFORM_STACK_IMPL != 0 + +//#pragma message("compilation of cross-platform stack implementation") #define THIS_FILE "stack.c" @@ -152,3 +157,4 @@ PJ_DEF(pj_size_t) pj_stack_size(/*const*/ pj_stack_type *stack) return count; } +#endif // PJ_USE_CROSSPLATFORM_STACK_IMPL != 0 diff --git a/pjlib/src/pj/stack_win32.c b/pjlib/src/pj/stack_win32.c index c498fe4084..568e54d53b 100644 --- a/pjlib/src/pj/stack_win32.c +++ b/pjlib/src/pj/stack_win32.c @@ -5,6 +5,17 @@ #include #include +/* + * stack_win32.c + * + * This file contains the stack implementation for Windows platform. + * + * If all prerequisites are met, this file will be included in stack.c, + * which is the cross-platform stack implementation. + * + * This file should generally NOT be compiled as standalone source. + */ + #ifndef PJ_WIN32 #error stack_win32.c should be compiled �nly for Windows platform #endif // PJ_WIN32 @@ -13,15 +24,26 @@ #include -#define THIS_FILE "stack_win32.c" +#ifndef THIS_FILE +# define THIS_FILE "stack_win32.c" +#endif // !THIS_FILE + #if PJ_POOL_ALIGNMENT < MEMORY_ALLOCATION_ALIGNMENT -#error pj_stack implementation for Windows platform required PJ_POOL_ALIGNMENT macro set to value not less then MEMORY_ALLOCATION_ALIGNMENT \ - (platform dependent constant declared in winnt.h) \ - please add next line to your config_site.h file: #define PJ_POOL_ALIGNMENT MEMORY_ALLOCATION_ALIGNMENT\ - for this you may also need to #include into config_site.h +#error pj_stack implementation for Windows platform required PJ_POOL_ALIGNMENT \ +macro set to value not less then MEMORY_ALLOCATION_ALIGNMENT. \ +(The MEMORY_ALLOCATION_ALIGNMENT macro which is 16 on the x64 platform and 8 on the x86 platform \ +is the platform default alignment for the Windows platform and is set in winnt.h.) \ +Please add the following line to your config_site.h file: #define PJ_POOL_ALIGNMENT MEMORY_ALLOCATION_ALIGNMENT \ +for this you may also need to #include into config_site.h #endif +//#pragma message("compilation of Windows platform stack implementation") + +//uncomment next line to check alignment in runtime +//#define PJ_STACK_ALIGN_DEBUG + + struct pj_stack_type { SLIST_HEADER head; @@ -37,10 +59,12 @@ PJ_DEF(pj_status_t) pj_stack_create(pj_pool_t *pool, pj_stack_type **stack) if (!p_stack) return PJ_ENOMEM; +#ifdef PJ_STACK_ALIGN_DEBUG PJ_ASSERT_ON_FAIL(IS_ALIGNED_PTR(&p_stack->head, MEMORY_ALLOCATION_ALIGNMENT), { PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, p_stack)); return PJ_EINVALIDOP; }); +#endif //PJ_STACK_ALIGN_DEBUG InitializeSListHead(&p_stack->head); @@ -62,6 +86,7 @@ PJ_DEF(pj_status_t) pj_stack_destroy(pj_stack_type *stack) PJ_DEF(pj_status_t) pj_stack_push(pj_stack_type *stack, pj_stack_t *node) { +#ifdef PJ_STACK_ALIGN_DEBUG PJ_ASSERT_RETURN(node && stack, PJ_EINVAL); PJ_ASSERT_ON_FAIL( IS_ALIGNED_PTR(&stack->head, MEMORY_ALLOCATION_ALIGNMENT) && @@ -70,6 +95,7 @@ PJ_DEF(pj_status_t) pj_stack_push(pj_stack_type *stack, pj_stack_t *node) PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, stack)); return PJ_EINVALIDOP; }); +#endif //PJ_STACK_ALIGN_DEBUG /*pFirstEntry =*/ InterlockedPushEntrySList(&stack->head, node); return PJ_SUCCESS; @@ -78,12 +104,14 @@ PJ_DEF(pj_status_t) pj_stack_push(pj_stack_type *stack, pj_stack_t *node) PJ_DEF(pj_stack_t*) pj_stack_pop(pj_stack_type *stack) { +#ifdef PJ_STACK_ALIGN_DEBUG PJ_ASSERT_RETURN(stack, NULL); PJ_ASSERT_ON_FAIL(IS_ALIGNED_PTR(&stack->head, MEMORY_ALLOCATION_ALIGNMENT), { PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, stack)); return NULL; }); +#endif //PJ_STACK_ALIGN_DEBUG return InterlockedPopEntrySList(&stack->head); } @@ -101,12 +129,14 @@ PJ_DEF(pj_stack_t*) pj_stack_pop(pj_stack_type *stack) */ PJ_DEF(pj_size_t) pj_stack_size(/*const*/ pj_stack_type *stack) { +#ifdef PJ_STACK_ALIGN_DEBUG PJ_ASSERT_RETURN(stack, 0); PJ_ASSERT_ON_FAIL(IS_ALIGNED_PTR(&stack->head, MEMORY_ALLOCATION_ALIGNMENT), { PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, stack)); return 0; }); +#endif //PJ_STACK_ALIGN_DEBUG return QueryDepthSList(&stack->head); } diff --git a/pjlib/src/pjlib-test/stack.c b/pjlib/src/pjlib-test/stack.c index d63cb21503..874ed15e29 100644 --- a/pjlib/src/pjlib-test/stack.c +++ b/pjlib/src/pjlib-test/stack.c @@ -14,6 +14,9 @@ * - pj_stack_pop() * - pj_stack_destroy() * + * MACROS tested: + * - PJ_STACK_ALIGN_PREFIX + * - PJ_STACK_ALIGN_SUFFIX * * This file is pjlib-test/stack.c * @@ -24,89 +27,57 @@ #include -#ifdef PJ_WIN32 +#if defined(PJ_WIN32) && !PJ_USE_CROSSPLATFORM_STACK_IMPL && !defined(MEMORY_ALLOCATION_ALIGNMENT) -# if !defined(MEMORY_ALLOCATION_ALIGNMENT) -# include -# endif //MEMORY_ALLOCATION_ALIGNMENT +# include -#endif // PJ_WIN32 +#endif #define THIS_FILE "stack.c" #define MAX_RESERVED 16 #define MAX_SLOTS 100 -#ifdef PJ_WIN32 -# define MAX_THREADS 32 -# define MAX_REPEATS 100000 -#else - /* for other platforms, the stack implementation has no performance advantage - * over the list. There is no point in waiting long. - */ -# define MAX_THREADS 2 -# define MAX_REPEATS 1000 -#endif // PJ_WIN32 +#define MAX_THREADS 2 +#define MAX_REPEATS 100000 #define TRACE(log) PJ_LOG(3,log) -typedef struct PJ_SYS_ALIGN_PREFIX stack_node { +typedef struct PJ_STACK_ALIGN_PREFIX stack_node { PJ_DECL_STACK_MEMBER(struct stack_node); int value; -} PJ_SYS_ALIGN_SUFFIX stack_node; +} PJ_STACK_ALIGN_SUFFIX stack_node; /* any useful data; * here simply pj_thread_t* - thread owned this slot * alignment of array's items used as stack node under Windows platform should not be less than MEMORY_ALLOCATION_ALIGNMENT */ -typedef struct PJ_SYS_ALIGN_PREFIX slot_data +typedef struct PJ_STACK_ALIGN_PREFIX slot_data { PJ_DECL_STACK_MEMBER(struct slot_data); - pj_thread_t *owner; -} PJ_SYS_ALIGN_SUFFIX slot_data; - -typedef struct slot_data_list -{ - PJ_DECL_LIST_MEMBER(struct list_node); - - pj_thread_t* owner; -} slot_data_list; + pj_thread_t *owner; /* this member simulates "payload" - user data stored in this slot */ +} PJ_STACK_ALIGN_SUFFIX slot_data; typedef struct stack_test_desc stack_test_desc; typedef struct stack_test_desc { struct { const char *title; int n_threads; /* number of worker threads */ - unsigned repeat; /* number of successfull slot reservation on each concurrent thread*/ - int (*test_init)(stack_test_desc *test); - int (*test_destroy)(stack_test_desc *test); - int (*worker_thread)(stack_test_desc* test); - } cfg; struct { pj_pool_t *pool; pj_stack_type *empty_slot_stack; /**< Empty slots stack. In current implemetation each stack item store pointer to slot*/ slot_data slots[MAX_SLOTS]; /**< Array of useful information "slots" (file players, for example).*/ - - pj_list empty_slot_list; - pj_lock_t *list_lock; /* list is not thread safe, lock required*/ - slot_data_list slots_list[MAX_SLOTS]; /**< Array of useful information "slots" (file players, for example).*/ - int retcode; /* test retcode. non-zero will abort. */ } state; } stack_test_desc; static int stack_stress_test_init(stack_test_desc* test); static int stack_stress_test_destroy(stack_test_desc* test); -static int stack_worker_thread(stack_test_desc* test); - -static int list_stress_test_init(stack_test_desc* test); -static int list_stress_test_destroy(stack_test_desc* test); -static int list_worker_thread(stack_test_desc* test); static int stack_stress_test(stack_test_desc* test); static int worker_thread(void* p); @@ -115,45 +86,13 @@ static stack_test_desc tests[] = { { .cfg.title = "stack (single thread)", .cfg.n_threads = 0, - .cfg.repeat = MAX_REPEATS, - .cfg.test_init = &stack_stress_test_init, - .cfg.test_destroy = &stack_stress_test_destroy, - .cfg.worker_thread = &stack_worker_thread + .cfg.repeat = MAX_REPEATS }, -#ifdef PJ_WIN32 - /* for other platforms, the stack implementation has no performance advantage - * over the list - */ - { - .cfg.title = "list (single thread)", - .cfg.n_threads = 0, - .cfg.repeat = MAX_REPEATS, - .cfg.test_init = &list_stress_test_init, - .cfg.test_destroy = &list_stress_test_destroy, - .cfg.worker_thread = &list_worker_thread - }, -#endif { .cfg.title = "stack (multi threads)", .cfg.n_threads = MAX_THREADS, - .cfg.repeat = MAX_REPEATS, - .cfg.test_init = &stack_stress_test_init, - .cfg.test_destroy = &stack_stress_test_destroy, - .cfg.worker_thread = &stack_worker_thread - }, -#ifdef PJ_WIN32 - /* for other platforms, the stack implementation has no performance advantage - * over the list - */ - { - .cfg.title = "list (multi threads)", - .cfg.n_threads = MAX_THREADS, - .cfg.repeat = MAX_REPEATS, - .cfg.test_init = &list_stress_test_init, - .cfg.test_destroy = &list_stress_test_destroy, - .cfg.worker_thread = &list_worker_thread + .cfg.repeat = MAX_REPEATS } -#endif }; int stack_test() @@ -182,7 +121,9 @@ int stack_test() goto error; } -#ifdef PJ_WIN32 +#if defined(PJ_WIN32) && !PJ_USE_CROSSPLATFORM_STACK_IMPL + + /* Here we check our alignment macros PJ_STACK_ALIGN_PREFIX, PJ_STACK_ALIGN_SUFFIX */ # if defined(_MSC_VER) # pragma warning(push) @@ -208,7 +149,7 @@ int stack_test() } } -#endif // PJ_WIN32 +#endif // !PJ_USE_CROSSPLATFORM_STACK_IMPL //const char* stack_test = "stack_test"; // test stack_create() @@ -269,9 +210,8 @@ int stack_test() /* * This test illustrates: - * 1) a multi-threaded use case for the pj_stack API + * 1) a multi-threaded use case for the pj_stack API (pj_stack is thread safe) * 2) a useful idea: reserving an empty slot in a large array without having to lock the entire array - * 3) pj_stack performance on Windows is 2-5x higher than pj_list with pj_simple_mutex_lock */ static int stack_stress_test(stack_test_desc* test) { unsigned i; @@ -283,7 +223,7 @@ static int stack_stress_test(stack_test_desc* test) { int ident = pj_log_get_indent(); /* worker_thread change ident on this thread */ pj_log_push_indent(); - rc = (*test->cfg.test_init)(test); + rc = stack_stress_test_init(test); if (rc) return rc; @@ -324,7 +264,7 @@ static int stack_stress_test(stack_test_desc* test) { pj_get_timestamp(&t2); - rc = (*test->cfg.test_destroy)(test); + rc = stack_stress_test_destroy(test); if (rc) return rc; @@ -362,41 +302,10 @@ static int stack_stress_test_destroy(stack_test_desc* test) { return 0; } -static int list_stress_test_init(stack_test_desc* test) { - pj_status_t status; - - pj_list_init(&test->state.empty_slot_list); - - slot_data_list *p; - for (p = test->state.slots_list + PJ_ARRAY_SIZE(test->state.slots_list) - 1; p > test->state.slots_list - 1; --p) { - pj_list_push_back(&test->state.empty_slot_list, p); - } - status = pj_lock_create_simple_mutex(test->state.pool, "stress_test_list_lock", &test->state.list_lock); - if (status != PJ_SUCCESS) { - PJ_PERROR(1, (THIS_FILE, status, "Unable to create simple mutex lock")); - return -67; - } - return 0; -} - -static int list_stress_test_destroy(stack_test_desc* test) { - pj_status_t status; - status = pj_lock_destroy(test->state.list_lock); - if (status != PJ_SUCCESS) { - PJ_PERROR(1, (THIS_FILE, status, "Unable to destroy simple mutex lock")); - return -77; - } - return 0; -} - /* worker thread */ static int worker_thread(void* p) { stack_test_desc* test = (stack_test_desc*)p; - return (*test->cfg.worker_thread)(test); -} -static int stack_worker_thread(stack_test_desc* test) -{ unsigned n_events = 0; unsigned reserved_slots[MAX_RESERVED]; unsigned reserved_count = 0; @@ -451,88 +360,6 @@ static int stack_worker_thread(stack_test_desc* test) return 0; } -static int list_worker_thread(stack_test_desc* test) { - unsigned n_events = 0; - unsigned reserved_slots[MAX_RESERVED]; - unsigned reserved_count = 0; - unsigned slot_id; - pj_status_t status; - - pj_bzero(reserved_slots, sizeof(reserved_slots)); - - /* log indent is not propagated to other threads, - * so we set it explicitly here - */ - pj_log_set_indent(3); - - while (test->state.retcode == 0 && n_events < test->cfg.repeat) { - status = pj_lock_acquire(test->state.list_lock); - if (status != PJ_SUCCESS) { - PJ_PERROR(1, (THIS_FILE, status, "Unable to acquire lock")); - return -78; - } - - slot_data_list* slot = test->state.empty_slot_list.next; - if (!pj_list_empty(slot)) - pj_list_erase(slot); - else - slot = NULL; - - status = pj_lock_release(test->state.list_lock); - if (status != PJ_SUCCESS) { - PJ_PERROR(1, (THIS_FILE, status, "Unable to release lock")); - return -79; - } - if (slot != NULL) { /* we have got an empty slot */ - if (slot->owner != NULL) { - PJ_LOG(1, (THIS_FILE, "Reserved slot is not empty")); - test->state.retcode = -86; - break; - } else { - slot->owner = pj_thread_this(); /* slot reserved successfully */ - slot_id = slot - test->state.slots_list; - reserved_slots[reserved_count++] = slot_id; - ++n_events; - - } - } - if (slot == NULL || /* no empty slots at all or */ - reserved_count >= MAX_RESERVED || /* this thread has reserved the maximum number of slots allowed */ - n_events >= test->cfg.repeat) { /* or test completed */ - while (reserved_count) { /* clear slots reserved here */ - slot_id = reserved_slots[--reserved_count]; - slot = &test->state.slots_list[slot_id]; - if (slot->owner != pj_thread_this()) { - PJ_LOG(1, (THIS_FILE, "Anothed thread has reserved this thread's slot")); - test->state.retcode = -84; - } - else if (slot->owner == NULL) { - PJ_LOG(1, (THIS_FILE, "Anothed thread has freed up this thread's slot")); - test->state.retcode = -83; - } - else { - slot->owner = NULL; /* free up slot before returning */ - status = pj_lock_acquire(test->state.list_lock); - if (status != PJ_SUCCESS) { - PJ_PERROR(1, (THIS_FILE, status, "Unable to acquire lock")); - return -81; - } - pj_list_push_back(&test->state.empty_slot_list, slot); /* slot returned to empty slot's stack */ - status = pj_lock_release(test->state.list_lock); - if (status != PJ_SUCCESS) { - PJ_PERROR(1, (THIS_FILE, status, "Unable to release lock")); - return -82; - } - - } - } - } - - } - - TRACE((THIS_FILE, "thread exiting, n_events=%d", n_events)); - return 0; -} #else /* To prevent warning about "translation unit is empty" From 3b0e0a4719d40d98f809224c6f9b82abc870f5b2 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Tue, 10 Dec 2024 22:26:47 +0100 Subject: [PATCH 22/33] some irreleveant changes in the patch removed --- build/vs/pjproject-vs14-common-config.props | 2 +- pjlib/include/pj/compat/os_win32.h | 1 + pjlib/include/pj/compat/os_winuwp.h | 1 + pjlib/include/pj/config.h | 50 +++++++++++++++++++++ pjlib/include/pj/stack.h | 50 ++++++++------------- pjlib/src/pj/stack.c | 6 +-- pjlib/src/pjlib-test/stack.c | 6 +-- 7 files changed, 77 insertions(+), 39 deletions(-) diff --git a/build/vs/pjproject-vs14-common-config.props b/build/vs/pjproject-vs14-common-config.props index d2e455b4c9..840bf93e34 100644 --- a/build/vs/pjproject-vs14-common-config.props +++ b/build/vs/pjproject-vs14-common-config.props @@ -18,7 +18,7 @@ WinDesktop - v143 + v140 diff --git a/pjlib/include/pj/compat/os_win32.h b/pjlib/include/pj/compat/os_win32.h index 78c47fd3ec..a9b3512c99 100644 --- a/pjlib/include/pj/compat/os_win32.h +++ b/pjlib/include/pj/compat/os_win32.h @@ -148,5 +148,6 @@ # endif #endif + #endif /* __PJ_COMPAT_OS_WIN32_H__ */ diff --git a/pjlib/include/pj/compat/os_winuwp.h b/pjlib/include/pj/compat/os_winuwp.h index b75219af5b..60b8e2a343 100644 --- a/pjlib/include/pj/compat/os_winuwp.h +++ b/pjlib/include/pj/compat/os_winuwp.h @@ -145,4 +145,5 @@ */ #define PJ_THREAD_ALLOCATE_STACK 0 + #endif /* __PJ_COMPAT_OS_UWP_H__ */ diff --git a/pjlib/include/pj/config.h b/pjlib/include/pj/config.h index 49ff05ba32..af76a2196d 100644 --- a/pjlib/include/pj/config.h +++ b/pjlib/include/pj/config.h @@ -1176,6 +1176,56 @@ # define PJ_JNI_HAS_JNI_ONLOAD PJ_ANDROID #endif +/** + * pj_stack implementation. + * Select one of these implementations in PJ_STACK_IMPLEMENTATION. + */ + /** Using os independent "cross-platform" implementation */ +#define PJ_STACK_OS_INDEPENDENT 0 + + /** Using Windows's single linked list */ +#define PJ_STACK_WIN32 1 + + /** + * Select which pj_stack implementation to use. Currently pjlib supports + * PJ_STACK_OS_INDEPENDENT, which uses internal pjsip os independent + * "cross-platform" implementation, and + * PJ_STACK_WIN32, which uses Windows's single linked list. + * The last option is very fast, but requires data alignment (see below). + * + * Default is PJ_STACK_OS_INDEPENDENT. + */ +#ifndef PJ_STACK_IMPLEMENTATION +# define PJ_STACK_IMPLEMENTATION PJ_STACK_OS_INDEPENDENT +#endif + +#if !defined(PJ_POOL_ALIGNMENT) && PJ_STACK_IMPLEMENTATION==PJ_STACK_WIN32 +/** + * PJ_STACK_WIN32 pj_stack implementation is based on Windows single linked list and requires aligned data, + * both stack item and stack itself should be aligned by 8 (for x86) or 16 (for x64) byte. + * For this purpose winnt.h define MEMORY_ALLOCATION_ALIGNMENT as 8 for x86, ARM, ARM64 and + * 16 for x64 and ARM64EC. + * see winnt.h + * + * We need to define PJ_POOL_ALIGNMENT as MEMORY_ALLOCATION_ALIGNMENT for the Windows platform to + * dynamicaly allocate memory used by some Windows APIs. + * For example the pj_stack implementation and possibly some other implemented APIs require and check + * that PJ_POOL_ALIGNMENT is at least equal to MEMORY_ALLOCATION_ALIGNMENT, + * which is 16 on the x64 platform and 8 on the x86 platform. + * + * But it is too early to use MEMORY_ALLOCATION_ALIGNMENT constant here + * so we need to explicity declare PJ_POOL_ALIGNMENT as 8 or 16, as opposed to + * pjsip's default of 4 - see pool.h + */ +# if defined(MEMORY_ALLOCATION_ALIGNMENT) +# define PJ_POOL_ALIGNMENT MEMORY_ALLOCATION_ALIGNMENT +# elif defined(_WIN64) || defined(_M_ALPHA) +# define PJ_POOL_ALIGNMENT 16 +# else +# define PJ_POOL_ALIGNMENT 8 +# endif +#endif + /** @} */ diff --git a/pjlib/include/pj/stack.h b/pjlib/include/pj/stack.h index ce7465304a..61472b0c15 100644 --- a/pjlib/include/pj/stack.h +++ b/pjlib/include/pj/stack.h @@ -8,30 +8,7 @@ #include -/** - * Specify if compiler should use crossplatform stack implementation - * even if this compilation is for Windows platform. - * The performance of pj_stack implementation for Windows platform is 2-5x higher than cross-platform. - * - * To use the implementation on the Windows platform, some prerequisites must be met: - * - this should be compiling for Windows platform - * - add #define PJ_USE_CROSSPLATFORM_STACK_IMPL 0 - * to your config_site.h - * - PJ_POOL_ALIGNMENT should be defined in config_site.h and not less then MEMORY_ALLOCATION_ALIGNMENT - * The MEMORY_ALLOCATION_ALIGNMENT macro which is 16 on the x64 platform and 8 on the x86 platform - * is the platform default alignment for the Windows platform and is set in winnt.h. - * - * - * Default: 1 (crossplatform) - * - * 0 - use the Windows platform stack implementation - * 1 - force the crossplatform stack implementation. - */ -#ifndef PJ_USE_CROSSPLATFORM_STACK_IMPL -# define PJ_USE_CROSSPLATFORM_STACK_IMPL 1 -#endif - -#if !PJ_USE_CROSSPLATFORM_STACK_IMPL +#if defined(PJ_STACK_IMPLEMENTATION) && PJ_STACK_IMPLEMENTATION==PJ_STACK_WIN32 /* the Windows platform stack implementation. */ @@ -43,14 +20,14 @@ # define PJ_STACK_ALIGN_PREFIX PJ_ALIGN_DATA_PREFIX(PJ_POOL_ALIGNMENT) # define PJ_STACK_ALIGN_SUFFIX PJ_ALIGN_DATA_SUFFIX(PJ_POOL_ALIGNMENT) -#else // PJ_USE_CROSSPLATFORM_STACK_IMPL != 0 +#else // PJ_STACK_IMPLEMENTATION != PJ_STACK_WIN32 /* compilation of crossplatform stack implementation */ # define PJ_STACK_ALIGN_PREFIX # define PJ_STACK_ALIGN_SUFFIX -#endif +#endif // PJ_STACK_IMPLEMENTATION #include @@ -62,7 +39,7 @@ PJ_BEGIN_DECL */ /** - * @defgroup PJ_STACK Single Linked List with FILO in/out policy + * @defgroup PJ_STACK Single Linked List with LIFO in/out policy * @ingroup PJ_DS * @{ * @@ -71,14 +48,23 @@ PJ_BEGIN_DECL * Implementation for Windows platform uses locking free Windows embeded single linked list implementation. * The performance of pj_stack implementation for Windows platform is 2-5x higher than cross-platform. * - * Windows single linked list implementation requires aligned data, both stack item and stack itself should - * be aligned by 8 (for x86) or 16 (for x64) byte. We recomend set PJ_POOL_ALIGNMENT macro to corresponding value. - * winnt.h define MEMORY_ALLOCATION_ALIGNMENT macro for this purpose. + * By default pjlib compile and link os independent "cross-platform" implementation. + * To select implementation you may optionaly define PJ_STACK_IMPLEMENTATION as PJ_STACK_WIN32 + * or PJ_STACK_OS_INDEPENDENT. The last option is default. + * * To use the implementation on the Windows platform, some prerequisites must be met: * - this should be compiling for Windows platform - * - add #define PJ_USE_CROSSPLATFORM_STACK_IMPL 0 + * - add #define PJ_STACK_IMPLEMENTATION PJ_STACK_WIN32 * to your config_site.h - * - PJ_POOL_ALIGNMENT should be defined in config_site.h and not less then MEMORY_ALLOCATION_ALIGNMENT + * + * Windows single linked list implementation requires aligned data, both stack item and stack itself should + * be aligned by 8 (for x86) or 16 (for x64) byte. + * pjsip build system define PJ_POOL_ALIGNMENT macro to corresponding value. + * winnt.h define MEMORY_ALLOCATION_ALIGNMENT macro for this purpose. + * To use this macro in build system we recomend (this is optional) to add #include + * to your config_site.h. + * You may redefine PJ_POOL_ALIGNMENT in your config_site.h but to use PJ_STACK_WIN32 implementation + * PJ_POOL_ALIGNMENTshould not be less then MEMORY_ALLOCATION_ALIGNMENT * * Stack won't require dynamic memory allocation (just as all PJLIB data structures). The stack here * should be viewed more like a low level C stack instead of high level C++ stack diff --git a/pjlib/src/pj/stack.c b/pjlib/src/pj/stack.c index 8a5bddf86c..5f068e23a7 100644 --- a/pjlib/src/pj/stack.c +++ b/pjlib/src/pj/stack.c @@ -7,12 +7,12 @@ #include -#if !PJ_USE_CROSSPLATFORM_STACK_IMPL +#if defined(PJ_STACK_IMPLEMENTATION) && PJ_STACK_IMPLEMENTATION==PJ_STACK_WIN32 /* Include the Windows platform stack implementation. */ # include "stack_win32.c" -#else // PJ_USE_CROSSPLATFORM_STACK_IMPL != 0 +#else // PJ_STACK_IMPLEMENTATION != PJ_STACK_WIN32 //#pragma message("compilation of cross-platform stack implementation") @@ -157,4 +157,4 @@ PJ_DEF(pj_size_t) pj_stack_size(/*const*/ pj_stack_type *stack) return count; } -#endif // PJ_USE_CROSSPLATFORM_STACK_IMPL != 0 +#endif // PJ_STACK_IMPLEMENTATION diff --git a/pjlib/src/pjlib-test/stack.c b/pjlib/src/pjlib-test/stack.c index 874ed15e29..9fb4c688f7 100644 --- a/pjlib/src/pjlib-test/stack.c +++ b/pjlib/src/pjlib-test/stack.c @@ -27,7 +27,7 @@ #include -#if defined(PJ_WIN32) && !PJ_USE_CROSSPLATFORM_STACK_IMPL && !defined(MEMORY_ALLOCATION_ALIGNMENT) +#if defined(PJ_WIN32) && PJ_STACK_IMPLEMENTATION==PJ_STACK_WIN32 && !defined(MEMORY_ALLOCATION_ALIGNMENT) # include @@ -121,7 +121,7 @@ int stack_test() goto error; } -#if defined(PJ_WIN32) && !PJ_USE_CROSSPLATFORM_STACK_IMPL +#if defined(PJ_WIN32) && PJ_STACK_IMPLEMENTATION==PJ_STACK_WIN32 /* Here we check our alignment macros PJ_STACK_ALIGN_PREFIX, PJ_STACK_ALIGN_SUFFIX */ @@ -149,7 +149,7 @@ int stack_test() } } -#endif // !PJ_USE_CROSSPLATFORM_STACK_IMPL +#endif // PJ_STACK_IMPLEMENTATION==PJ_STACK_WIN32 //const char* stack_test = "stack_test"; // test stack_create() From 23610d65bb0935e25273431ace2c45965d0f0d6a Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Wed, 11 Dec 2024 19:02:38 +0100 Subject: [PATCH 23/33] pjlib\build\pjlib.vcxproj.filters --- pjlib/build/pjlib.vcxproj.filters | 906 +++++++++++++++--------------- 1 file changed, 453 insertions(+), 453 deletions(-) diff --git a/pjlib/build/pjlib.vcxproj.filters b/pjlib/build/pjlib.vcxproj.filters index 23cd27de38..68e72cd70a 100644 --- a/pjlib/build/pjlib.vcxproj.filters +++ b/pjlib/build/pjlib.vcxproj.filters @@ -1,227 +1,230 @@ - - - - - {c8a8e8d9-1fbe-477c-91c9-5f4c495a2ad1} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {366d56a2-30a3-409b-9bd6-14ddc94069e0} - - - {77df8652-bc15-4733-a454-bbf8f16f93f1} - h;hpp;hxx;hm;inl - - - {3e7b3f2e-8699-43c9-801e-2c54e3f07023} - - - {4befc994-9aa4-47c8-99e7-5a51301220dd} - - - {4a92fce6-2308-44cf-aa66-00ccd5b333bd} - - - {3550aa38-c59d-4d5f-b458-1f93e0b16bbd} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\winrt - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - + + + + + {c8a8e8d9-1fbe-477c-91c9-5f4c495a2ad1} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {366d56a2-30a3-409b-9bd6-14ddc94069e0} + + + {77df8652-bc15-4733-a454-bbf8f16f93f1} + h;hpp;hxx;hm;inl + + + {3e7b3f2e-8699-43c9-801e-2c54e3f07023} + + + {4befc994-9aa4-47c8-99e7-5a51301220dd} + + + {4a92fce6-2308-44cf-aa66-00ccd5b333bd} + + + {3550aa38-c59d-4d5f-b458-1f93e0b16bbd} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\winrt + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + Source Files @@ -229,233 +232,230 @@ Source Files - - - Source Files - - - - - Source Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Inline Files - - - Inline Files - - - Inline Files - - - Header Files\compat - - - Header Files\winrt - - - Header Files\compat - - - Header Files - - - Header Files\compat - - - Header Files - - - Header Files - - - Header Files - - + + + + + Source Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Inline Files + + + Inline Files + + + Inline Files + + + Header Files\compat + + + Header Files\winrt + + + Header Files\compat + + + Header Files + + + Header Files\compat + + + Header Files + + + Header Files + + \ No newline at end of file From 6fefbf5d3177dcfd9727b9fcaed930c197e3b1c9 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Wed, 11 Dec 2024 19:35:20 +0100 Subject: [PATCH 24/33] copyright info added --- pjlib/include/pj/stack.h | 18 ++++++++++++++++++ pjlib/src/pj/stack.c | 18 ++++++++++++++++++ pjlib/src/pj/stack_win32.c | 20 +++++++++++++++++++- pjlib/src/pjlib-test/stack.c | 18 ++++++++++++++++++ 4 files changed, 73 insertions(+), 1 deletion(-) diff --git a/pjlib/include/pj/stack.h b/pjlib/include/pj/stack.h index 61472b0c15..69e6f60949 100644 --- a/pjlib/include/pj/stack.h +++ b/pjlib/include/pj/stack.h @@ -1,3 +1,21 @@ +/* +* Copyright (C) 2008-2024 Teluu Inc. (http://www.teluu.com) +* Copyright (C) 2022-2024 Leonid Goltsblat +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ #ifndef __PJ_STACK_H__ #define __PJ_STACK_H__ diff --git a/pjlib/src/pj/stack.c b/pjlib/src/pj/stack.c index 5f068e23a7..3684e733bf 100644 --- a/pjlib/src/pj/stack.c +++ b/pjlib/src/pj/stack.c @@ -1,3 +1,21 @@ +/* +* Copyright (C) 2008-2024 Teluu Inc. (http://www.teluu.com) +* Copyright (C) 2022-2024 Leonid Goltsblat +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ #include #include #include diff --git a/pjlib/src/pj/stack_win32.c b/pjlib/src/pj/stack_win32.c index 568e54d53b..d624c74332 100644 --- a/pjlib/src/pj/stack_win32.c +++ b/pjlib/src/pj/stack_win32.c @@ -1,3 +1,21 @@ +/* +* Copyright (C) 2008-2024 Teluu Inc. (http://www.teluu.com) +* Copyright (C) 2022-2024 Leonid Goltsblat +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ #include #include #include @@ -17,7 +35,7 @@ */ #ifndef PJ_WIN32 -#error stack_win32.c should be compiled �nly for Windows platform +#error stack_win32.c should be compiled only for Windows platform #endif // PJ_WIN32 #include diff --git a/pjlib/src/pjlib-test/stack.c b/pjlib/src/pjlib-test/stack.c index 9fb4c688f7..3bb6c811a8 100644 --- a/pjlib/src/pjlib-test/stack.c +++ b/pjlib/src/pjlib-test/stack.c @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2008-2024 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2022-2024 Leonid Goltsblat + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ #include "test.h" /** From 6c8347381553f72c24270ca26c9bab0a9d5a5c63 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Wed, 11 Dec 2024 19:51:14 +0100 Subject: [PATCH 25/33] copyright 2 --- .editorconfig | 84 +++++++++ pjlib/include/pj/stack.h | 34 ++-- pjlib/src/pj/stack.c | 348 ++++++++++++++++++------------------- pjlib/src/pj/stack_win32.c | 310 ++++++++++++++++----------------- 4 files changed, 430 insertions(+), 346 deletions(-) diff --git a/.editorconfig b/.editorconfig index 5bea015dce..357b202f9b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,3 +6,87 @@ insert_final_newline = true indent_style = space indent_size = 4 # trim_trailing_whitespace = true + +[*.{cs,vb}] +dotnet_style_operator_placement_when_wrapping = beginning_of_line +tab_width = 4 +indent_size = 4 +end_of_line = crlf +dotnet_style_coalesce_expression = true:suggestion +dotnet_style_null_propagation = true:suggestion +dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion +dotnet_style_prefer_auto_properties = true:silent +dotnet_style_object_initializer = true:suggestion +dotnet_style_collection_initializer = true:suggestion +dotnet_style_prefer_simplified_boolean_expressions = true:suggestion +dotnet_style_prefer_conditional_expression_over_assignment = true:silent +dotnet_style_prefer_conditional_expression_over_return = true:silent +dotnet_style_explicit_tuple_names = true:suggestion +dotnet_style_prefer_inferred_tuple_names = true:suggestion +dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion +dotnet_style_prefer_compound_assignment = true:suggestion +dotnet_style_prefer_simplified_interpolation = true:suggestion +dotnet_style_prefer_collection_expression = when_types_loosely_match:suggestion +dotnet_style_namespace_match_folder = true:suggestion +dotnet_style_readonly_field = true:suggestion +dotnet_style_predefined_type_for_locals_parameters_members = true:silent +dotnet_style_predefined_type_for_member_access = true:silent +dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent +dotnet_style_allow_multiple_blank_lines_experimental = true:silent +dotnet_style_allow_statement_immediately_after_block_experimental = true:silent +dotnet_code_quality_unused_parameters = all:suggestion +dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent +dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent +dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent +dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent +dotnet_style_qualification_for_field = false:silent +dotnet_style_qualification_for_property = false:silent +dotnet_style_qualification_for_method = false:silent +dotnet_style_qualification_for_event = false:silent +[*.{cs,vb}] +#### Naming styles #### + +# Naming rules + +dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion +dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface +dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i + +dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.types_should_be_pascal_case.symbols = types +dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case + +dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members +dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case + +# Symbol specifications + +dotnet_naming_symbols.interface.applicable_kinds = interface +dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.interface.required_modifiers = + +dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum +dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.types.required_modifiers = + +dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method +dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.non_field_members.required_modifiers = + +# Naming styles + +dotnet_naming_style.begins_with_i.required_prefix = I +dotnet_naming_style.begins_with_i.required_suffix = +dotnet_naming_style.begins_with_i.word_separator = +dotnet_naming_style.begins_with_i.capitalization = pascal_case + +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case + +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case diff --git a/pjlib/include/pj/stack.h b/pjlib/include/pj/stack.h index 69e6f60949..6e9cf32611 100644 --- a/pjlib/include/pj/stack.h +++ b/pjlib/include/pj/stack.h @@ -1,21 +1,21 @@ /* -* Copyright (C) 2008-2024 Teluu Inc. (http://www.teluu.com) -* Copyright (C) 2022-2024 Leonid Goltsblat -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ + * Copyright (C) 2008-2024 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2022-2024 Leonid Goltsblat + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ #ifndef __PJ_STACK_H__ #define __PJ_STACK_H__ diff --git a/pjlib/src/pj/stack.c b/pjlib/src/pj/stack.c index 3684e733bf..67d75be83b 100644 --- a/pjlib/src/pj/stack.c +++ b/pjlib/src/pj/stack.c @@ -1,178 +1,178 @@ -/* -* Copyright (C) 2008-2024 Teluu Inc. (http://www.teluu.com) -* Copyright (C) 2022-2024 Leonid Goltsblat -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ -#include -#include -#include -#include -#include -#include - -#include - -#if defined(PJ_STACK_IMPLEMENTATION) && PJ_STACK_IMPLEMENTATION==PJ_STACK_WIN32 - - /* Include the Windows platform stack implementation. */ -# include "stack_win32.c" - +/* + * Copyright (C) 2008-2024 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2022-2024 Leonid Goltsblat + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#include +#include +#include +#include +#include +#include + +#include + +#if defined(PJ_STACK_IMPLEMENTATION) && PJ_STACK_IMPLEMENTATION==PJ_STACK_WIN32 + + /* Include the Windows platform stack implementation. */ +# include "stack_win32.c" + #else // PJ_STACK_IMPLEMENTATION != PJ_STACK_WIN32 //#pragma message("compilation of cross-platform stack implementation") - -#define THIS_FILE "stack.c" - -/** - * This structure describes generic stack node and stack. The owner of this stack - * must initialize the 'value' member to an appropriate value (typically the - * owner itself). - */ -typedef struct pj_stack_item_t -{ - PJ_DECL_STACK_MEMBER(void); -} PJ_ATTR_MAY_ALIAS pj_stack_item_t; /* may_alias avoids warning with gcc-4.4 -Wall -O2 */ - - -struct pj_stack_type -{ - pj_stack_item_t head; - pj_mutex_t *mutex; -}; - -PJ_DEF(pj_status_t) pj_stack_create(pj_pool_t *pool, pj_stack_type **stack) -{ - pj_stack_type *p_stack; - pj_status_t rc; - - PJ_ASSERT_RETURN(pool && stack, PJ_EINVAL); - - p_stack = PJ_POOL_ZALLOC_T(pool, pj_stack_type); - if (!p_stack) - return PJ_ENOMEM; - - char name[PJ_MAX_OBJ_NAME]; - /* Set name. */ - pj_ansi_snprintf(name, PJ_MAX_OBJ_NAME, "stc%p", p_stack); - - rc = pj_mutex_create_simple(pool, name, &p_stack->mutex); - if (rc != PJ_SUCCESS) - return rc; - - - p_stack->head.next = &p_stack->head; - *stack = p_stack; - - PJ_LOG(6, (THIS_FILE, "Stack created stc%p", p_stack)); - return PJ_SUCCESS; - -} - - -PJ_DEF(pj_status_t) pj_stack_destroy(pj_stack_type *stack) -{ - PJ_ASSERT_RETURN(stack, PJ_EINVAL); - pj_status_t rc; - rc = pj_mutex_destroy(stack->mutex); - if (rc == PJ_SUCCESS) - { - PJ_LOG(6, (THIS_FILE, "Stack destroyed stc%p", stack)); - } - return rc; -} - - -PJ_DEF(pj_status_t) pj_stack_push(pj_stack_type *stack, pj_stack_t *node) -{ - PJ_ASSERT_RETURN(node && stack, PJ_EINVAL); - pj_status_t status; - if ((status = pj_mutex_lock(stack->mutex)) != PJ_SUCCESS) - { - PJ_PERROR(1, ("pj_stack_push", status, "Error locking mutex for stack stc%p", stack)); - return status; - } - ((pj_stack_item_t*)node)->next = stack->head.next; - stack->head.next = node; - if ((status = pj_mutex_unlock(stack->mutex)) != PJ_SUCCESS) - { - PJ_PERROR(1, ("pj_stack_push", status, "Error unlocking mutex for stack stc%p", stack)); - } - return status; -} - - -PJ_DEF(pj_stack_t*) pj_stack_pop(pj_stack_type *stack) -{ - PJ_ASSERT_RETURN(stack, NULL); - pj_status_t status; - if ((status = pj_mutex_lock(stack->mutex)) != PJ_SUCCESS) - { - PJ_PERROR(1, ("pj_stack_pop", status, "Error locking mutex for stack stc%p", stack)); - return NULL; - } - - pj_stack_item_t *node = stack->head.next; - if (node != &stack->head) { - stack->head.next = node->next; - node->next = NULL; - } - else - node = NULL; - - if ((status = pj_mutex_unlock(stack->mutex)) != PJ_SUCCESS) - PJ_PERROR(1, ("pj_stack_pop", status, "Error unlocking mutex for stack stc%p", stack)); - - return node; -} - - -/** - * Traverse the stack and get it's elements quantity. - * The return value of pj_stack_size should not be relied upon in multithreaded applications - * because the item count can be changed at any time by another thread. - * For Windows platform returns the number of entries in the stack modulo 65535. For example, - * if the specified stack contains 65536 entries, pj_stack_size returns zero. - * - * @param stack The target stack. - * - * @return Number of elements. - */ -PJ_DEF(pj_size_t) pj_stack_size(/*const*/ pj_stack_type *stack) -{ - PJ_ASSERT_RETURN(stack, 0); - pj_status_t status; - if ((status = pj_mutex_lock(stack->mutex)) != PJ_SUCCESS) - { - PJ_PERROR(1, ("pj_stack_size", status, "Error locking mutex for stack stc%p", stack)); - return 0; - } - - const pj_stack_item_t *node = stack->head.next; - pj_size_t count = 0; - - while (node != node->next) { - ++count; - node = node->next; - } - - if ((status = pj_mutex_unlock(stack->mutex)) != PJ_SUCCESS) - { - PJ_PERROR(1, ("pj_stack_size", status, "Error unlocking mutex for stack stc%p", stack)); - } - - return count; -} + +#define THIS_FILE "stack.c" + +/** + * This structure describes generic stack node and stack. The owner of this stack + * must initialize the 'value' member to an appropriate value (typically the + * owner itself). + */ +typedef struct pj_stack_item_t +{ + PJ_DECL_STACK_MEMBER(void); +} PJ_ATTR_MAY_ALIAS pj_stack_item_t; /* may_alias avoids warning with gcc-4.4 -Wall -O2 */ + + +struct pj_stack_type +{ + pj_stack_item_t head; + pj_mutex_t *mutex; +}; + +PJ_DEF(pj_status_t) pj_stack_create(pj_pool_t *pool, pj_stack_type **stack) +{ + pj_stack_type *p_stack; + pj_status_t rc; + + PJ_ASSERT_RETURN(pool && stack, PJ_EINVAL); + + p_stack = PJ_POOL_ZALLOC_T(pool, pj_stack_type); + if (!p_stack) + return PJ_ENOMEM; + + char name[PJ_MAX_OBJ_NAME]; + /* Set name. */ + pj_ansi_snprintf(name, PJ_MAX_OBJ_NAME, "stc%p", p_stack); + + rc = pj_mutex_create_simple(pool, name, &p_stack->mutex); + if (rc != PJ_SUCCESS) + return rc; + + + p_stack->head.next = &p_stack->head; + *stack = p_stack; + + PJ_LOG(6, (THIS_FILE, "Stack created stc%p", p_stack)); + return PJ_SUCCESS; + +} + + +PJ_DEF(pj_status_t) pj_stack_destroy(pj_stack_type *stack) +{ + PJ_ASSERT_RETURN(stack, PJ_EINVAL); + pj_status_t rc; + rc = pj_mutex_destroy(stack->mutex); + if (rc == PJ_SUCCESS) + { + PJ_LOG(6, (THIS_FILE, "Stack destroyed stc%p", stack)); + } + return rc; +} + + +PJ_DEF(pj_status_t) pj_stack_push(pj_stack_type *stack, pj_stack_t *node) +{ + PJ_ASSERT_RETURN(node && stack, PJ_EINVAL); + pj_status_t status; + if ((status = pj_mutex_lock(stack->mutex)) != PJ_SUCCESS) + { + PJ_PERROR(1, ("pj_stack_push", status, "Error locking mutex for stack stc%p", stack)); + return status; + } + ((pj_stack_item_t*)node)->next = stack->head.next; + stack->head.next = node; + if ((status = pj_mutex_unlock(stack->mutex)) != PJ_SUCCESS) + { + PJ_PERROR(1, ("pj_stack_push", status, "Error unlocking mutex for stack stc%p", stack)); + } + return status; +} + + +PJ_DEF(pj_stack_t*) pj_stack_pop(pj_stack_type *stack) +{ + PJ_ASSERT_RETURN(stack, NULL); + pj_status_t status; + if ((status = pj_mutex_lock(stack->mutex)) != PJ_SUCCESS) + { + PJ_PERROR(1, ("pj_stack_pop", status, "Error locking mutex for stack stc%p", stack)); + return NULL; + } + + pj_stack_item_t *node = stack->head.next; + if (node != &stack->head) { + stack->head.next = node->next; + node->next = NULL; + } + else + node = NULL; + + if ((status = pj_mutex_unlock(stack->mutex)) != PJ_SUCCESS) + PJ_PERROR(1, ("pj_stack_pop", status, "Error unlocking mutex for stack stc%p", stack)); + + return node; +} + + +/** + * Traverse the stack and get it's elements quantity. + * The return value of pj_stack_size should not be relied upon in multithreaded applications + * because the item count can be changed at any time by another thread. + * For Windows platform returns the number of entries in the stack modulo 65535. For example, + * if the specified stack contains 65536 entries, pj_stack_size returns zero. + * + * @param stack The target stack. + * + * @return Number of elements. + */ +PJ_DEF(pj_size_t) pj_stack_size(/*const*/ pj_stack_type *stack) +{ + PJ_ASSERT_RETURN(stack, 0); + pj_status_t status; + if ((status = pj_mutex_lock(stack->mutex)) != PJ_SUCCESS) + { + PJ_PERROR(1, ("pj_stack_size", status, "Error locking mutex for stack stc%p", stack)); + return 0; + } + + const pj_stack_item_t *node = stack->head.next; + pj_size_t count = 0; + + while (node != node->next) { + ++count; + node = node->next; + } + + if ((status = pj_mutex_unlock(stack->mutex)) != PJ_SUCCESS) + { + PJ_PERROR(1, ("pj_stack_size", status, "Error unlocking mutex for stack stc%p", stack)); + } + + return count; +} #endif // PJ_STACK_IMPLEMENTATION diff --git a/pjlib/src/pj/stack_win32.c b/pjlib/src/pj/stack_win32.c index d624c74332..fabf241af9 100644 --- a/pjlib/src/pj/stack_win32.c +++ b/pjlib/src/pj/stack_win32.c @@ -1,160 +1,160 @@ -/* -* Copyright (C) 2008-2024 Teluu Inc. (http://www.teluu.com) -* Copyright (C) 2022-2024 Leonid Goltsblat -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ -#include -#include -#include -#include -#include -#include - -/* - * stack_win32.c - * - * This file contains the stack implementation for Windows platform. - * - * If all prerequisites are met, this file will be included in stack.c, - * which is the cross-platform stack implementation. - * - * This file should generally NOT be compiled as standalone source. - */ - -#ifndef PJ_WIN32 -#error stack_win32.c should be compiled only for Windows platform -#endif // PJ_WIN32 - -#include - -#include - +/* + * Copyright (C) 2008-2024 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2022-2024 Leonid Goltsblat + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#include +#include +#include +#include +#include +#include + +/* + * stack_win32.c + * + * This file contains the stack implementation for Windows platform. + * + * If all prerequisites are met, this file will be included in stack.c, + * which is the cross-platform stack implementation. + * + * This file should generally NOT be compiled as standalone source. + */ + +#ifndef PJ_WIN32 +#error stack_win32.c should be compiled only for Windows platform +#endif // PJ_WIN32 + +#include + +#include + #ifndef THIS_FILE -# define THIS_FILE "stack_win32.c" +# define THIS_FILE "stack_win32.c" #endif // !THIS_FILE - - -#if PJ_POOL_ALIGNMENT < MEMORY_ALLOCATION_ALIGNMENT -#error pj_stack implementation for Windows platform required PJ_POOL_ALIGNMENT \ -macro set to value not less then MEMORY_ALLOCATION_ALIGNMENT. \ -(The MEMORY_ALLOCATION_ALIGNMENT macro which is 16 on the x64 platform and 8 on the x86 platform \ -is the platform default alignment for the Windows platform and is set in winnt.h.) \ -Please add the following line to your config_site.h file: #define PJ_POOL_ALIGNMENT MEMORY_ALLOCATION_ALIGNMENT \ -for this you may also need to #include into config_site.h -#endif - + + +#if PJ_POOL_ALIGNMENT < MEMORY_ALLOCATION_ALIGNMENT +#error pj_stack implementation for Windows platform required PJ_POOL_ALIGNMENT \ +macro set to value not less then MEMORY_ALLOCATION_ALIGNMENT. \ +(The MEMORY_ALLOCATION_ALIGNMENT macro which is 16 on the x64 platform and 8 on the x86 platform \ +is the platform default alignment for the Windows platform and is set in winnt.h.) \ +Please add the following line to your config_site.h file: #define PJ_POOL_ALIGNMENT MEMORY_ALLOCATION_ALIGNMENT \ +for this you may also need to #include into config_site.h +#endif + //#pragma message("compilation of Windows platform stack implementation") //uncomment next line to check alignment in runtime -//#define PJ_STACK_ALIGN_DEBUG - - -struct pj_stack_type -{ - SLIST_HEADER head; -}; - - -PJ_DEF(pj_status_t) pj_stack_create(pj_pool_t *pool, pj_stack_type **stack) -{ - - PJ_ASSERT_RETURN(pool && stack, PJ_EINVAL); - - pj_stack_type* p_stack = PJ_POOL_ALLOC_T(pool, pj_stack_type); - if (!p_stack) - return PJ_ENOMEM; - -#ifdef PJ_STACK_ALIGN_DEBUG - PJ_ASSERT_ON_FAIL(IS_ALIGNED_PTR(&p_stack->head, MEMORY_ALLOCATION_ALIGNMENT), { - PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, p_stack)); - return PJ_EINVALIDOP; - }); -#endif //PJ_STACK_ALIGN_DEBUG - - InitializeSListHead(&p_stack->head); - - *stack = p_stack; - PJ_LOG(6, (THIS_FILE, "Stack created stc%p", p_stack)); - return PJ_SUCCESS; - -} - - -PJ_DEF(pj_status_t) pj_stack_destroy(pj_stack_type *stack) -{ - PJ_ASSERT_RETURN(stack, PJ_EINVAL); - //nothing to do here - PJ_LOG(6, (THIS_FILE, "Stack destroyed stc%p", stack)); - return PJ_SUCCESS; -} - - -PJ_DEF(pj_status_t) pj_stack_push(pj_stack_type *stack, pj_stack_t *node) -{ -#ifdef PJ_STACK_ALIGN_DEBUG - PJ_ASSERT_RETURN(node && stack, PJ_EINVAL); - - PJ_ASSERT_ON_FAIL( IS_ALIGNED_PTR(&stack->head, MEMORY_ALLOCATION_ALIGNMENT) && - IS_ALIGNED_PTR(node, MEMORY_ALLOCATION_ALIGNMENT), - { - PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, stack)); - return PJ_EINVALIDOP; - }); -#endif //PJ_STACK_ALIGN_DEBUG - - /*pFirstEntry =*/ InterlockedPushEntrySList(&stack->head, node); - return PJ_SUCCESS; -} - - -PJ_DEF(pj_stack_t*) pj_stack_pop(pj_stack_type *stack) -{ -#ifdef PJ_STACK_ALIGN_DEBUG - PJ_ASSERT_RETURN(stack, NULL); - PJ_ASSERT_ON_FAIL(IS_ALIGNED_PTR(&stack->head, MEMORY_ALLOCATION_ALIGNMENT), - { - PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, stack)); - return NULL; - }); -#endif //PJ_STACK_ALIGN_DEBUG - - return InterlockedPopEntrySList(&stack->head); -} - -/** - * Get the stack's elements quantity. - * The return value of pj_stack_size should not be relied upon in multithreaded applications - * because the item count can be changed at any time by another thread. - * For Windows platform returns the number of entries in the stack modulo 65535. For example, - * if the specified stack contains 65536 entries, pj_stack_size returns zero. - * - * @param stack The target stack. - * - * @return Number of elements. - */ -PJ_DEF(pj_size_t) pj_stack_size(/*const*/ pj_stack_type *stack) -{ -#ifdef PJ_STACK_ALIGN_DEBUG - PJ_ASSERT_RETURN(stack, 0); - PJ_ASSERT_ON_FAIL(IS_ALIGNED_PTR(&stack->head, MEMORY_ALLOCATION_ALIGNMENT), - { - PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, stack)); - return 0; - }); -#endif //PJ_STACK_ALIGN_DEBUG - - return QueryDepthSList(&stack->head); -} +//#define PJ_STACK_ALIGN_DEBUG + + +struct pj_stack_type +{ + SLIST_HEADER head; +}; + + +PJ_DEF(pj_status_t) pj_stack_create(pj_pool_t *pool, pj_stack_type **stack) +{ + + PJ_ASSERT_RETURN(pool && stack, PJ_EINVAL); + + pj_stack_type* p_stack = PJ_POOL_ALLOC_T(pool, pj_stack_type); + if (!p_stack) + return PJ_ENOMEM; + +#ifdef PJ_STACK_ALIGN_DEBUG + PJ_ASSERT_ON_FAIL(IS_ALIGNED_PTR(&p_stack->head, MEMORY_ALLOCATION_ALIGNMENT), { + PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, p_stack)); + return PJ_EINVALIDOP; + }); +#endif //PJ_STACK_ALIGN_DEBUG + + InitializeSListHead(&p_stack->head); + + *stack = p_stack; + PJ_LOG(6, (THIS_FILE, "Stack created stc%p", p_stack)); + return PJ_SUCCESS; + +} + + +PJ_DEF(pj_status_t) pj_stack_destroy(pj_stack_type *stack) +{ + PJ_ASSERT_RETURN(stack, PJ_EINVAL); + //nothing to do here + PJ_LOG(6, (THIS_FILE, "Stack destroyed stc%p", stack)); + return PJ_SUCCESS; +} + + +PJ_DEF(pj_status_t) pj_stack_push(pj_stack_type *stack, pj_stack_t *node) +{ +#ifdef PJ_STACK_ALIGN_DEBUG + PJ_ASSERT_RETURN(node && stack, PJ_EINVAL); + + PJ_ASSERT_ON_FAIL( IS_ALIGNED_PTR(&stack->head, MEMORY_ALLOCATION_ALIGNMENT) && + IS_ALIGNED_PTR(node, MEMORY_ALLOCATION_ALIGNMENT), + { + PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, stack)); + return PJ_EINVALIDOP; + }); +#endif //PJ_STACK_ALIGN_DEBUG + + /*pFirstEntry =*/ InterlockedPushEntrySList(&stack->head, node); + return PJ_SUCCESS; +} + + +PJ_DEF(pj_stack_t*) pj_stack_pop(pj_stack_type *stack) +{ +#ifdef PJ_STACK_ALIGN_DEBUG + PJ_ASSERT_RETURN(stack, NULL); + PJ_ASSERT_ON_FAIL(IS_ALIGNED_PTR(&stack->head, MEMORY_ALLOCATION_ALIGNMENT), + { + PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, stack)); + return NULL; + }); +#endif //PJ_STACK_ALIGN_DEBUG + + return InterlockedPopEntrySList(&stack->head); +} + +/** + * Get the stack's elements quantity. + * The return value of pj_stack_size should not be relied upon in multithreaded applications + * because the item count can be changed at any time by another thread. + * For Windows platform returns the number of entries in the stack modulo 65535. For example, + * if the specified stack contains 65536 entries, pj_stack_size returns zero. + * + * @param stack The target stack. + * + * @return Number of elements. + */ +PJ_DEF(pj_size_t) pj_stack_size(/*const*/ pj_stack_type *stack) +{ +#ifdef PJ_STACK_ALIGN_DEBUG + PJ_ASSERT_RETURN(stack, 0); + PJ_ASSERT_ON_FAIL(IS_ALIGNED_PTR(&stack->head, MEMORY_ALLOCATION_ALIGNMENT), + { + PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, stack)); + return 0; + }); +#endif //PJ_STACK_ALIGN_DEBUG + + return QueryDepthSList(&stack->head); +} From 88e02f372e01ec2ac198dbc61effe4ceac15fe77 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Wed, 11 Dec 2024 20:10:25 +0100 Subject: [PATCH 26/33] line ending --- pjlib/build/pjlib.vcxproj.filters | 904 +++++++++++++++--------------- 1 file changed, 452 insertions(+), 452 deletions(-) diff --git a/pjlib/build/pjlib.vcxproj.filters b/pjlib/build/pjlib.vcxproj.filters index 68e72cd70a..bd81d5d523 100644 --- a/pjlib/build/pjlib.vcxproj.filters +++ b/pjlib/build/pjlib.vcxproj.filters @@ -1,229 +1,229 @@ - - - - - {c8a8e8d9-1fbe-477c-91c9-5f4c495a2ad1} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {366d56a2-30a3-409b-9bd6-14ddc94069e0} - - - {77df8652-bc15-4733-a454-bbf8f16f93f1} - h;hpp;hxx;hm;inl - - - {3e7b3f2e-8699-43c9-801e-2c54e3f07023} - - - {4befc994-9aa4-47c8-99e7-5a51301220dd} - - - {4a92fce6-2308-44cf-aa66-00ccd5b333bd} - - - {3550aa38-c59d-4d5f-b458-1f93e0b16bbd} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\winrt - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - + + + + + {c8a8e8d9-1fbe-477c-91c9-5f4c495a2ad1} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {366d56a2-30a3-409b-9bd6-14ddc94069e0} + + + {77df8652-bc15-4733-a454-bbf8f16f93f1} + h;hpp;hxx;hm;inl + + + {3e7b3f2e-8699-43c9-801e-2c54e3f07023} + + + {4befc994-9aa4-47c8-99e7-5a51301220dd} + + + {4a92fce6-2308-44cf-aa66-00ccd5b333bd} + + + {3550aa38-c59d-4d5f-b458-1f93e0b16bbd} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\winrt + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + Source Files @@ -232,230 +232,230 @@ Source Files - - - - - Source Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Inline Files - - - Inline Files - - - Inline Files - - - Header Files\compat - - - Header Files\winrt - - - Header Files\compat - - - Header Files - - - Header Files\compat - - - Header Files - - - Header Files - - + + + + + Source Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Inline Files + + + Inline Files + + + Inline Files + + + Header Files\compat + + + Header Files\winrt + + + Header Files\compat + + + Header Files + + + Header Files\compat + + + Header Files + + + Header Files + + \ No newline at end of file From 445f8a17ad2535841f34a6cc35861af8ca5afcce Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Wed, 11 Dec 2024 20:26:42 +0100 Subject: [PATCH 27/33] undone .. --- .editorconfig | 84 --------------------------------------------------- 1 file changed, 84 deletions(-) diff --git a/.editorconfig b/.editorconfig index 357b202f9b..5bea015dce 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,87 +6,3 @@ insert_final_newline = true indent_style = space indent_size = 4 # trim_trailing_whitespace = true - -[*.{cs,vb}] -dotnet_style_operator_placement_when_wrapping = beginning_of_line -tab_width = 4 -indent_size = 4 -end_of_line = crlf -dotnet_style_coalesce_expression = true:suggestion -dotnet_style_null_propagation = true:suggestion -dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion -dotnet_style_prefer_auto_properties = true:silent -dotnet_style_object_initializer = true:suggestion -dotnet_style_collection_initializer = true:suggestion -dotnet_style_prefer_simplified_boolean_expressions = true:suggestion -dotnet_style_prefer_conditional_expression_over_assignment = true:silent -dotnet_style_prefer_conditional_expression_over_return = true:silent -dotnet_style_explicit_tuple_names = true:suggestion -dotnet_style_prefer_inferred_tuple_names = true:suggestion -dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion -dotnet_style_prefer_compound_assignment = true:suggestion -dotnet_style_prefer_simplified_interpolation = true:suggestion -dotnet_style_prefer_collection_expression = when_types_loosely_match:suggestion -dotnet_style_namespace_match_folder = true:suggestion -dotnet_style_readonly_field = true:suggestion -dotnet_style_predefined_type_for_locals_parameters_members = true:silent -dotnet_style_predefined_type_for_member_access = true:silent -dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent -dotnet_style_allow_multiple_blank_lines_experimental = true:silent -dotnet_style_allow_statement_immediately_after_block_experimental = true:silent -dotnet_code_quality_unused_parameters = all:suggestion -dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent -dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent -dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent -dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent -dotnet_style_qualification_for_field = false:silent -dotnet_style_qualification_for_property = false:silent -dotnet_style_qualification_for_method = false:silent -dotnet_style_qualification_for_event = false:silent -[*.{cs,vb}] -#### Naming styles #### - -# Naming rules - -dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion -dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface -dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i - -dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion -dotnet_naming_rule.types_should_be_pascal_case.symbols = types -dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case - -dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion -dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members -dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case - -# Symbol specifications - -dotnet_naming_symbols.interface.applicable_kinds = interface -dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.interface.required_modifiers = - -dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum -dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.types.required_modifiers = - -dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method -dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.non_field_members.required_modifiers = - -# Naming styles - -dotnet_naming_style.begins_with_i.required_prefix = I -dotnet_naming_style.begins_with_i.required_suffix = -dotnet_naming_style.begins_with_i.word_separator = -dotnet_naming_style.begins_with_i.capitalization = pascal_case - -dotnet_naming_style.pascal_case.required_prefix = -dotnet_naming_style.pascal_case.required_suffix = -dotnet_naming_style.pascal_case.word_separator = -dotnet_naming_style.pascal_case.capitalization = pascal_case - -dotnet_naming_style.pascal_case.required_prefix = -dotnet_naming_style.pascal_case.required_suffix = -dotnet_naming_style.pascal_case.word_separator = -dotnet_naming_style.pascal_case.capitalization = pascal_case From 9f38c205be42df007958d275e5aa286792241953 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Thu, 12 Dec 2024 19:44:23 +0100 Subject: [PATCH 28/33] line ending --- pjlib/build/pjlib.vcxproj.filters | 920 +++++++------- pjlib/build/pjlib_test.vcxproj | 1626 ++++++++++++------------ pjlib/build/pjlib_test.vcxproj.filters | 274 ++-- 3 files changed, 1410 insertions(+), 1410 deletions(-) diff --git a/pjlib/build/pjlib.vcxproj.filters b/pjlib/build/pjlib.vcxproj.filters index bd81d5d523..d86856eb54 100644 --- a/pjlib/build/pjlib.vcxproj.filters +++ b/pjlib/build/pjlib.vcxproj.filters @@ -1,461 +1,461 @@ - - - - - {c8a8e8d9-1fbe-477c-91c9-5f4c495a2ad1} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {366d56a2-30a3-409b-9bd6-14ddc94069e0} - - - {77df8652-bc15-4733-a454-bbf8f16f93f1} - h;hpp;hxx;hm;inl - - - {3e7b3f2e-8699-43c9-801e-2c54e3f07023} - - - {4befc994-9aa4-47c8-99e7-5a51301220dd} - - - {4a92fce6-2308-44cf-aa66-00ccd5b333bd} - - - {3550aa38-c59d-4d5f-b458-1f93e0b16bbd} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\Other Targets - - - Source Files\winrt - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Header Files\compat - - - Inline Files - - - Inline Files - - - Inline Files - - - Header Files\compat - - - Header Files\winrt - - - Header Files\compat - - - Header Files - - - Header Files\compat - - - Header Files - - - Header Files - - + + + + + {c8a8e8d9-1fbe-477c-91c9-5f4c495a2ad1} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {366d56a2-30a3-409b-9bd6-14ddc94069e0} + + + {77df8652-bc15-4733-a454-bbf8f16f93f1} + h;hpp;hxx;hm;inl + + + {3e7b3f2e-8699-43c9-801e-2c54e3f07023} + + + {4befc994-9aa4-47c8-99e7-5a51301220dd} + + + {4a92fce6-2308-44cf-aa66-00ccd5b333bd} + + + {3550aa38-c59d-4d5f-b458-1f93e0b16bbd} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\Other Targets + + + Source Files\winrt + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Header Files\compat + + + Inline Files + + + Inline Files + + + Inline Files + + + Header Files\compat + + + Header Files\winrt + + + Header Files\compat + + + Header Files + + + Header Files\compat + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/pjlib/build/pjlib_test.vcxproj b/pjlib/build/pjlib_test.vcxproj index cb262166b5..09bfa76296 100644 --- a/pjlib/build/pjlib_test.vcxproj +++ b/pjlib/build/pjlib_test.vcxproj @@ -1,814 +1,814 @@ - - - - - Debug-Dynamic - ARM - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug-Static - ARM - - - Debug-Static - ARM64 - - - Debug-Static - Win32 - - - Debug-Static - x64 - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release-Static - ARM - - - Release-Static - ARM64 - - - Release-Static - Win32 - - - Release-Static - x64 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16} - pjlib_test - - en-US - - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - Application - v140 - false - MultiByte - - - - $(BuildToolset) - - - Application - StaticLibrary - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) - - - - - MultiThreadedDebugDLL - - - ..\lib\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - ProgramDatabase - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - ProgramDatabase - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - X64 - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - MachineX64 - - - - - - ../include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - - - netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) - ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {23d7679c-764c-4e02-8b29-bb882ceeefe2} - false - - - - - + + + + + Debug-Dynamic + ARM + + + Debug-Dynamic + ARM64 + + + Debug-Dynamic + Win32 + + + Debug-Dynamic + x64 + + + Debug-Static + ARM + + + Debug-Static + ARM64 + + + Debug-Static + Win32 + + + Debug-Static + x64 + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release-Dynamic + ARM + + + Release-Dynamic + ARM64 + + + Release-Dynamic + Win32 + + + Release-Dynamic + x64 + + + Release-Static + ARM + + + Release-Static + ARM64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16} + pjlib_test + + en-US + + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + Application + v140 + false + MultiByte + + + + $(BuildToolset) + + + Application + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration) + + + + + MultiThreadedDebugDLL + + + ..\lib\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + ProgramDatabase + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + ProgramDatabase + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + X64 + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + MachineX64 + + + + + + ../include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + + + netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies) + ..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {23d7679c-764c-4e02-8b29-bb882ceeefe2} + false + + + + + \ No newline at end of file diff --git a/pjlib/build/pjlib_test.vcxproj.filters b/pjlib/build/pjlib_test.vcxproj.filters index 9ac0c8bc64..8879bfcd10 100644 --- a/pjlib/build/pjlib_test.vcxproj.filters +++ b/pjlib/build/pjlib_test.vcxproj.filters @@ -1,138 +1,138 @@ - - - - - {87ba28ea-fd15-43b2-8da2-52ca1fedaa86} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {d65a57ff-143e-46bc-92e3-bef39475b72a} - h;hpp;hxx;hm;inl - - - {131d925a-9a14-4c13-87f9-4350e5b57a65} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - + + + + + {87ba28ea-fd15-43b2-8da2-52ca1fedaa86} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {d65a57ff-143e-46bc-92e3-bef39475b72a} + h;hpp;hxx;hm;inl + + + {131d925a-9a14-4c13-87f9-4350e5b57a65} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + \ No newline at end of file From 40f57cc0b40c839ebe436528968a1dd6cb45e922 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Thu, 12 Dec 2024 19:53:25 +0100 Subject: [PATCH 29/33] rewind some unrelated changes --- build/vs/pjproject-vs14-common-config.props | 6 +- pjproject-vs14.sln | 20 +- pjsip-apps/build/pjsystest.vcxproj | 559 +++++++------------- 3 files changed, 217 insertions(+), 368 deletions(-) diff --git a/build/vs/pjproject-vs14-common-config.props b/build/vs/pjproject-vs14-common-config.props index 840bf93e34..456e4f02e1 100644 --- a/build/vs/pjproject-vs14-common-config.props +++ b/build/vs/pjproject-vs14-common-config.props @@ -23,15 +23,15 @@ - v143 + v140 WIN32;PJ_WIN32=1;PJ_M_I386=1; WIN64;PJ_WIN64=1;PJ_M_X86_64=1; - PJ_M_ARM64=1; + PJ_M_ARM64=1; - v143 + v140 PJ_WIN32_UWP;UNICODE;_UNICODE; $(PreprocessorDef);PJ_M_ARMV7=1; 10.0.10586.0 diff --git a/pjproject-vs14.sln b/pjproject-vs14.sln index 7ec360db4c..fcd0926d70 100644 --- a/pjproject-vs14.sln +++ b/pjproject-vs14.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.11.35327.3 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31624.102 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1DFF1CF3-DBD7-4DA4-A36D-663D695EB678}" ProjectSection(SolutionItems) = preProject @@ -121,6 +121,10 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimplePjsua2CS", "pjsip-apps\src\swig\csharp\sample\SimplePjsua2CS\SimplePjsua2CS.csproj", "{3DCDD02D-C3CF-40EB-A66C-F7C2DAD93FD9}" EndProject Global + GlobalSection(SharedMSBuildProjectFiles) = preSolution + pjsip-apps\src\pjsua\winrt\cli\comp\pjsua_cli_shared_comp.vcxitems*{207e7bd4-7b11-4a40-ba3a-cc627762a7b6}*SharedItemsImports = 4 + pjsip-apps\src\pjsua\winrt\cli\comp\pjsua_cli_shared_comp.vcxitems*{45d41acc-2c3c-43d2-bc10-02aa73ffc7c7}*SharedItemsImports = 9 + EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM @@ -1567,8 +1571,8 @@ Global {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|ARM.ActiveCfg = Debug|Win32 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|ARM64.ActiveCfg = Debug|ARM64 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|ARM64.Build.0 = Debug|ARM64 - {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32 - {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32 + {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|Win32.ActiveCfg = Debug|Win32 + {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|Win32.Build.0 = Debug|Win32 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|x64.ActiveCfg = Debug|x64 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|x64.Build.0 = Debug|x64 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Static|Any CPU.ActiveCfg = Release|x64 @@ -1593,8 +1597,8 @@ Global {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|ARM.ActiveCfg = Release|Win32 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|ARM64.ActiveCfg = Release|ARM64 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|ARM64.Build.0 = Release|ARM64 - {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32 - {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32 + {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|Win32.ActiveCfg = Release|Win32 + {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|Win32.Build.0 = Release|Win32 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|x64.ActiveCfg = Release|x64 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|x64.Build.0 = Release|x64 {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Static|Any CPU.ActiveCfg = Release|x64 @@ -2521,8 +2525,4 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9D1363FE-B481-479E-82A2-290F6C4DB91B} EndGlobalSection - GlobalSection(SharedMSBuildProjectFiles) = preSolution - pjsip-apps\src\pjsua\winrt\cli\comp\pjsua_cli_shared_comp.vcxitems*{207e7bd4-7b11-4a40-ba3a-cc627762a7b6}*SharedItemsImports = 4 - pjsip-apps\src\pjsua\winrt\cli\comp\pjsua_cli_shared_comp.vcxitems*{45d41acc-2c3c-43d2-bc10-02aa73ffc7c7}*SharedItemsImports = 9 - EndGlobalSection EndGlobal diff --git a/pjsip-apps/build/pjsystest.vcxproj b/pjsip-apps/build/pjsystest.vcxproj index 98786e29ef..568b2ff816 100644 --- a/pjsip-apps/build/pjsystest.vcxproj +++ b/pjsip-apps/build/pjsystest.vcxproj @@ -1,356 +1,205 @@ - - - - - Debug-Dynamic - ARM64 - - - Debug-Dynamic - Win32 - - - Debug-Dynamic - x64 - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release-Dynamic - ARM64 - - - Release-Dynamic - Win32 - - - Release-Dynamic - x64 - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - - - {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB} - pjsystest - Win32Proj - - en-US - - - - Application - v140 - - - Application - v140 - - - Application - v140 - - - Application - v140 - - - Application - v140 - - - Application - v140 - - - Application - v140 - - - Application - v140 - - - Application - v140 - - - Application - v140 - - - Application - v140 - - - Application - v140 - - - - $(BuildToolset) - - - Application - StaticLibrary - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - - - - - MultiThreadedDebugDLL - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - X64 - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - MachineX64 - - - - - X64 - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - MachineX64 - - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - X64 - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - MachineX64 - - - - - X64 - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - MachineX64 - - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - - ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) - - - - - - true - true - true - true - true - true - true - true - true - true - true - true - - - - - - - - - - {23d7679c-764c-4e02-8b29-bb882ceeefe2} - false - - - - - + + + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + {5E507EA2-CB39-47CA-BD39-49EB58D7A0BB} + pjsystest + Win32Proj + + en-US + + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + Application + v140 + + + + $(BuildToolset) + + + Application + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + + + + + MultiThreadedDebugDLL + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + X64 + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + MachineX64 + + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + X64 + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + MachineX64 + + + + + + ../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies) + + + + + + true + true + true + true + true + true + + + + + + + + + + {23d7679c-764c-4e02-8b29-bb882ceeefe2} + false + + + + + \ No newline at end of file From 934ba4aecfaa67aa354847a017162a4a6a0d3077 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Thu, 12 Dec 2024 20:05:41 +0100 Subject: [PATCH 30/33] line ending --- pjlib/src/pj/stack.c | 356 ++++++++++++++++++------------------- pjlib/src/pj/stack_win32.c | 320 ++++++++++++++++----------------- 2 files changed, 338 insertions(+), 338 deletions(-) diff --git a/pjlib/src/pj/stack.c b/pjlib/src/pj/stack.c index 67d75be83b..f0d99db880 100644 --- a/pjlib/src/pj/stack.c +++ b/pjlib/src/pj/stack.c @@ -1,178 +1,178 @@ -/* - * Copyright (C) 2008-2024 Teluu Inc. (http://www.teluu.com) - * Copyright (C) 2022-2024 Leonid Goltsblat - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#include -#include -#include -#include -#include -#include - -#include - -#if defined(PJ_STACK_IMPLEMENTATION) && PJ_STACK_IMPLEMENTATION==PJ_STACK_WIN32 - - /* Include the Windows platform stack implementation. */ -# include "stack_win32.c" - -#else // PJ_STACK_IMPLEMENTATION != PJ_STACK_WIN32 - -//#pragma message("compilation of cross-platform stack implementation") - -#define THIS_FILE "stack.c" - -/** - * This structure describes generic stack node and stack. The owner of this stack - * must initialize the 'value' member to an appropriate value (typically the - * owner itself). - */ -typedef struct pj_stack_item_t -{ - PJ_DECL_STACK_MEMBER(void); -} PJ_ATTR_MAY_ALIAS pj_stack_item_t; /* may_alias avoids warning with gcc-4.4 -Wall -O2 */ - - -struct pj_stack_type -{ - pj_stack_item_t head; - pj_mutex_t *mutex; -}; - -PJ_DEF(pj_status_t) pj_stack_create(pj_pool_t *pool, pj_stack_type **stack) -{ - pj_stack_type *p_stack; - pj_status_t rc; - - PJ_ASSERT_RETURN(pool && stack, PJ_EINVAL); - - p_stack = PJ_POOL_ZALLOC_T(pool, pj_stack_type); - if (!p_stack) - return PJ_ENOMEM; - - char name[PJ_MAX_OBJ_NAME]; - /* Set name. */ - pj_ansi_snprintf(name, PJ_MAX_OBJ_NAME, "stc%p", p_stack); - - rc = pj_mutex_create_simple(pool, name, &p_stack->mutex); - if (rc != PJ_SUCCESS) - return rc; - - - p_stack->head.next = &p_stack->head; - *stack = p_stack; - - PJ_LOG(6, (THIS_FILE, "Stack created stc%p", p_stack)); - return PJ_SUCCESS; - -} - - -PJ_DEF(pj_status_t) pj_stack_destroy(pj_stack_type *stack) -{ - PJ_ASSERT_RETURN(stack, PJ_EINVAL); - pj_status_t rc; - rc = pj_mutex_destroy(stack->mutex); - if (rc == PJ_SUCCESS) - { - PJ_LOG(6, (THIS_FILE, "Stack destroyed stc%p", stack)); - } - return rc; -} - - -PJ_DEF(pj_status_t) pj_stack_push(pj_stack_type *stack, pj_stack_t *node) -{ - PJ_ASSERT_RETURN(node && stack, PJ_EINVAL); - pj_status_t status; - if ((status = pj_mutex_lock(stack->mutex)) != PJ_SUCCESS) - { - PJ_PERROR(1, ("pj_stack_push", status, "Error locking mutex for stack stc%p", stack)); - return status; - } - ((pj_stack_item_t*)node)->next = stack->head.next; - stack->head.next = node; - if ((status = pj_mutex_unlock(stack->mutex)) != PJ_SUCCESS) - { - PJ_PERROR(1, ("pj_stack_push", status, "Error unlocking mutex for stack stc%p", stack)); - } - return status; -} - - -PJ_DEF(pj_stack_t*) pj_stack_pop(pj_stack_type *stack) -{ - PJ_ASSERT_RETURN(stack, NULL); - pj_status_t status; - if ((status = pj_mutex_lock(stack->mutex)) != PJ_SUCCESS) - { - PJ_PERROR(1, ("pj_stack_pop", status, "Error locking mutex for stack stc%p", stack)); - return NULL; - } - - pj_stack_item_t *node = stack->head.next; - if (node != &stack->head) { - stack->head.next = node->next; - node->next = NULL; - } - else - node = NULL; - - if ((status = pj_mutex_unlock(stack->mutex)) != PJ_SUCCESS) - PJ_PERROR(1, ("pj_stack_pop", status, "Error unlocking mutex for stack stc%p", stack)); - - return node; -} - - -/** - * Traverse the stack and get it's elements quantity. - * The return value of pj_stack_size should not be relied upon in multithreaded applications - * because the item count can be changed at any time by another thread. - * For Windows platform returns the number of entries in the stack modulo 65535. For example, - * if the specified stack contains 65536 entries, pj_stack_size returns zero. - * - * @param stack The target stack. - * - * @return Number of elements. - */ -PJ_DEF(pj_size_t) pj_stack_size(/*const*/ pj_stack_type *stack) -{ - PJ_ASSERT_RETURN(stack, 0); - pj_status_t status; - if ((status = pj_mutex_lock(stack->mutex)) != PJ_SUCCESS) - { - PJ_PERROR(1, ("pj_stack_size", status, "Error locking mutex for stack stc%p", stack)); - return 0; - } - - const pj_stack_item_t *node = stack->head.next; - pj_size_t count = 0; - - while (node != node->next) { - ++count; - node = node->next; - } - - if ((status = pj_mutex_unlock(stack->mutex)) != PJ_SUCCESS) - { - PJ_PERROR(1, ("pj_stack_size", status, "Error unlocking mutex for stack stc%p", stack)); - } - - return count; -} -#endif // PJ_STACK_IMPLEMENTATION +/* + * Copyright (C) 2008-2024 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2022-2024 Leonid Goltsblat + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#include +#include +#include +#include +#include +#include + +#include + +#if defined(PJ_STACK_IMPLEMENTATION) && PJ_STACK_IMPLEMENTATION==PJ_STACK_WIN32 + + /* Include the Windows platform stack implementation. */ +# include "stack_win32.c" + +#else // PJ_STACK_IMPLEMENTATION != PJ_STACK_WIN32 + +//#pragma message("compilation of cross-platform stack implementation") + +#define THIS_FILE "stack.c" + +/** + * This structure describes generic stack node and stack. The owner of this stack + * must initialize the 'value' member to an appropriate value (typically the + * owner itself). + */ +typedef struct pj_stack_item_t +{ + PJ_DECL_STACK_MEMBER(void); +} PJ_ATTR_MAY_ALIAS pj_stack_item_t; /* may_alias avoids warning with gcc-4.4 -Wall -O2 */ + + +struct pj_stack_type +{ + pj_stack_item_t head; + pj_mutex_t *mutex; +}; + +PJ_DEF(pj_status_t) pj_stack_create(pj_pool_t *pool, pj_stack_type **stack) +{ + pj_stack_type *p_stack; + pj_status_t rc; + + PJ_ASSERT_RETURN(pool && stack, PJ_EINVAL); + + p_stack = PJ_POOL_ZALLOC_T(pool, pj_stack_type); + if (!p_stack) + return PJ_ENOMEM; + + char name[PJ_MAX_OBJ_NAME]; + /* Set name. */ + pj_ansi_snprintf(name, PJ_MAX_OBJ_NAME, "stc%p", p_stack); + + rc = pj_mutex_create_simple(pool, name, &p_stack->mutex); + if (rc != PJ_SUCCESS) + return rc; + + + p_stack->head.next = &p_stack->head; + *stack = p_stack; + + PJ_LOG(6, (THIS_FILE, "Stack created stc%p", p_stack)); + return PJ_SUCCESS; + +} + + +PJ_DEF(pj_status_t) pj_stack_destroy(pj_stack_type *stack) +{ + PJ_ASSERT_RETURN(stack, PJ_EINVAL); + pj_status_t rc; + rc = pj_mutex_destroy(stack->mutex); + if (rc == PJ_SUCCESS) + { + PJ_LOG(6, (THIS_FILE, "Stack destroyed stc%p", stack)); + } + return rc; +} + + +PJ_DEF(pj_status_t) pj_stack_push(pj_stack_type *stack, pj_stack_t *node) +{ + PJ_ASSERT_RETURN(node && stack, PJ_EINVAL); + pj_status_t status; + if ((status = pj_mutex_lock(stack->mutex)) != PJ_SUCCESS) + { + PJ_PERROR(1, ("pj_stack_push", status, "Error locking mutex for stack stc%p", stack)); + return status; + } + ((pj_stack_item_t*)node)->next = stack->head.next; + stack->head.next = node; + if ((status = pj_mutex_unlock(stack->mutex)) != PJ_SUCCESS) + { + PJ_PERROR(1, ("pj_stack_push", status, "Error unlocking mutex for stack stc%p", stack)); + } + return status; +} + + +PJ_DEF(pj_stack_t*) pj_stack_pop(pj_stack_type *stack) +{ + PJ_ASSERT_RETURN(stack, NULL); + pj_status_t status; + if ((status = pj_mutex_lock(stack->mutex)) != PJ_SUCCESS) + { + PJ_PERROR(1, ("pj_stack_pop", status, "Error locking mutex for stack stc%p", stack)); + return NULL; + } + + pj_stack_item_t *node = stack->head.next; + if (node != &stack->head) { + stack->head.next = node->next; + node->next = NULL; + } + else + node = NULL; + + if ((status = pj_mutex_unlock(stack->mutex)) != PJ_SUCCESS) + PJ_PERROR(1, ("pj_stack_pop", status, "Error unlocking mutex for stack stc%p", stack)); + + return node; +} + + +/** + * Traverse the stack and get it's elements quantity. + * The return value of pj_stack_size should not be relied upon in multithreaded applications + * because the item count can be changed at any time by another thread. + * For Windows platform returns the number of entries in the stack modulo 65535. For example, + * if the specified stack contains 65536 entries, pj_stack_size returns zero. + * + * @param stack The target stack. + * + * @return Number of elements. + */ +PJ_DEF(pj_size_t) pj_stack_size(/*const*/ pj_stack_type *stack) +{ + PJ_ASSERT_RETURN(stack, 0); + pj_status_t status; + if ((status = pj_mutex_lock(stack->mutex)) != PJ_SUCCESS) + { + PJ_PERROR(1, ("pj_stack_size", status, "Error locking mutex for stack stc%p", stack)); + return 0; + } + + const pj_stack_item_t *node = stack->head.next; + pj_size_t count = 0; + + while (node != node->next) { + ++count; + node = node->next; + } + + if ((status = pj_mutex_unlock(stack->mutex)) != PJ_SUCCESS) + { + PJ_PERROR(1, ("pj_stack_size", status, "Error unlocking mutex for stack stc%p", stack)); + } + + return count; +} +#endif // PJ_STACK_IMPLEMENTATION diff --git a/pjlib/src/pj/stack_win32.c b/pjlib/src/pj/stack_win32.c index fabf241af9..0335e3adba 100644 --- a/pjlib/src/pj/stack_win32.c +++ b/pjlib/src/pj/stack_win32.c @@ -1,160 +1,160 @@ -/* - * Copyright (C) 2008-2024 Teluu Inc. (http://www.teluu.com) - * Copyright (C) 2022-2024 Leonid Goltsblat - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#include -#include -#include -#include -#include -#include - -/* - * stack_win32.c - * - * This file contains the stack implementation for Windows platform. - * - * If all prerequisites are met, this file will be included in stack.c, - * which is the cross-platform stack implementation. - * - * This file should generally NOT be compiled as standalone source. - */ - -#ifndef PJ_WIN32 -#error stack_win32.c should be compiled only for Windows platform -#endif // PJ_WIN32 - -#include - -#include - -#ifndef THIS_FILE -# define THIS_FILE "stack_win32.c" -#endif // !THIS_FILE - - -#if PJ_POOL_ALIGNMENT < MEMORY_ALLOCATION_ALIGNMENT -#error pj_stack implementation for Windows platform required PJ_POOL_ALIGNMENT \ -macro set to value not less then MEMORY_ALLOCATION_ALIGNMENT. \ -(The MEMORY_ALLOCATION_ALIGNMENT macro which is 16 on the x64 platform and 8 on the x86 platform \ -is the platform default alignment for the Windows platform and is set in winnt.h.) \ -Please add the following line to your config_site.h file: #define PJ_POOL_ALIGNMENT MEMORY_ALLOCATION_ALIGNMENT \ -for this you may also need to #include into config_site.h -#endif - -//#pragma message("compilation of Windows platform stack implementation") - -//uncomment next line to check alignment in runtime -//#define PJ_STACK_ALIGN_DEBUG - - -struct pj_stack_type -{ - SLIST_HEADER head; -}; - - -PJ_DEF(pj_status_t) pj_stack_create(pj_pool_t *pool, pj_stack_type **stack) -{ - - PJ_ASSERT_RETURN(pool && stack, PJ_EINVAL); - - pj_stack_type* p_stack = PJ_POOL_ALLOC_T(pool, pj_stack_type); - if (!p_stack) - return PJ_ENOMEM; - -#ifdef PJ_STACK_ALIGN_DEBUG - PJ_ASSERT_ON_FAIL(IS_ALIGNED_PTR(&p_stack->head, MEMORY_ALLOCATION_ALIGNMENT), { - PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, p_stack)); - return PJ_EINVALIDOP; - }); -#endif //PJ_STACK_ALIGN_DEBUG - - InitializeSListHead(&p_stack->head); - - *stack = p_stack; - PJ_LOG(6, (THIS_FILE, "Stack created stc%p", p_stack)); - return PJ_SUCCESS; - -} - - -PJ_DEF(pj_status_t) pj_stack_destroy(pj_stack_type *stack) -{ - PJ_ASSERT_RETURN(stack, PJ_EINVAL); - //nothing to do here - PJ_LOG(6, (THIS_FILE, "Stack destroyed stc%p", stack)); - return PJ_SUCCESS; -} - - -PJ_DEF(pj_status_t) pj_stack_push(pj_stack_type *stack, pj_stack_t *node) -{ -#ifdef PJ_STACK_ALIGN_DEBUG - PJ_ASSERT_RETURN(node && stack, PJ_EINVAL); - - PJ_ASSERT_ON_FAIL( IS_ALIGNED_PTR(&stack->head, MEMORY_ALLOCATION_ALIGNMENT) && - IS_ALIGNED_PTR(node, MEMORY_ALLOCATION_ALIGNMENT), - { - PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, stack)); - return PJ_EINVALIDOP; - }); -#endif //PJ_STACK_ALIGN_DEBUG - - /*pFirstEntry =*/ InterlockedPushEntrySList(&stack->head, node); - return PJ_SUCCESS; -} - - -PJ_DEF(pj_stack_t*) pj_stack_pop(pj_stack_type *stack) -{ -#ifdef PJ_STACK_ALIGN_DEBUG - PJ_ASSERT_RETURN(stack, NULL); - PJ_ASSERT_ON_FAIL(IS_ALIGNED_PTR(&stack->head, MEMORY_ALLOCATION_ALIGNMENT), - { - PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, stack)); - return NULL; - }); -#endif //PJ_STACK_ALIGN_DEBUG - - return InterlockedPopEntrySList(&stack->head); -} - -/** - * Get the stack's elements quantity. - * The return value of pj_stack_size should not be relied upon in multithreaded applications - * because the item count can be changed at any time by another thread. - * For Windows platform returns the number of entries in the stack modulo 65535. For example, - * if the specified stack contains 65536 entries, pj_stack_size returns zero. - * - * @param stack The target stack. - * - * @return Number of elements. - */ -PJ_DEF(pj_size_t) pj_stack_size(/*const*/ pj_stack_type *stack) -{ -#ifdef PJ_STACK_ALIGN_DEBUG - PJ_ASSERT_RETURN(stack, 0); - PJ_ASSERT_ON_FAIL(IS_ALIGNED_PTR(&stack->head, MEMORY_ALLOCATION_ALIGNMENT), - { - PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, stack)); - return 0; - }); -#endif //PJ_STACK_ALIGN_DEBUG - - return QueryDepthSList(&stack->head); -} +/* + * Copyright (C) 2008-2024 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2022-2024 Leonid Goltsblat + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#include +#include +#include +#include +#include +#include + +/* + * stack_win32.c + * + * This file contains the stack implementation for Windows platform. + * + * If all prerequisites are met, this file will be included in stack.c, + * which is the cross-platform stack implementation. + * + * This file should generally NOT be compiled as standalone source. + */ + +#ifndef PJ_WIN32 +#error stack_win32.c should be compiled only for Windows platform +#endif // PJ_WIN32 + +#include + +#include + +#ifndef THIS_FILE +# define THIS_FILE "stack_win32.c" +#endif // !THIS_FILE + + +#if PJ_POOL_ALIGNMENT < MEMORY_ALLOCATION_ALIGNMENT +#error pj_stack implementation for Windows platform required PJ_POOL_ALIGNMENT \ +macro set to value not less then MEMORY_ALLOCATION_ALIGNMENT. \ +(The MEMORY_ALLOCATION_ALIGNMENT macro which is 16 on the x64 platform and 8 on the x86 platform \ +is the platform default alignment for the Windows platform and is set in winnt.h.) \ +Please add the following line to your config_site.h file: #define PJ_POOL_ALIGNMENT MEMORY_ALLOCATION_ALIGNMENT \ +for this you may also need to #include into config_site.h +#endif + +//#pragma message("compilation of Windows platform stack implementation") + +//uncomment next line to check alignment in runtime +//#define PJ_STACK_ALIGN_DEBUG + + +struct pj_stack_type +{ + SLIST_HEADER head; +}; + + +PJ_DEF(pj_status_t) pj_stack_create(pj_pool_t *pool, pj_stack_type **stack) +{ + + PJ_ASSERT_RETURN(pool && stack, PJ_EINVAL); + + pj_stack_type* p_stack = PJ_POOL_ALLOC_T(pool, pj_stack_type); + if (!p_stack) + return PJ_ENOMEM; + +#ifdef PJ_STACK_ALIGN_DEBUG + PJ_ASSERT_ON_FAIL(IS_ALIGNED_PTR(&p_stack->head, MEMORY_ALLOCATION_ALIGNMENT), { + PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, p_stack)); + return PJ_EINVALIDOP; + }); +#endif //PJ_STACK_ALIGN_DEBUG + + InitializeSListHead(&p_stack->head); + + *stack = p_stack; + PJ_LOG(6, (THIS_FILE, "Stack created stc%p", p_stack)); + return PJ_SUCCESS; + +} + + +PJ_DEF(pj_status_t) pj_stack_destroy(pj_stack_type *stack) +{ + PJ_ASSERT_RETURN(stack, PJ_EINVAL); + //nothing to do here + PJ_LOG(6, (THIS_FILE, "Stack destroyed stc%p", stack)); + return PJ_SUCCESS; +} + + +PJ_DEF(pj_status_t) pj_stack_push(pj_stack_type *stack, pj_stack_t *node) +{ +#ifdef PJ_STACK_ALIGN_DEBUG + PJ_ASSERT_RETURN(node && stack, PJ_EINVAL); + + PJ_ASSERT_ON_FAIL( IS_ALIGNED_PTR(&stack->head, MEMORY_ALLOCATION_ALIGNMENT) && + IS_ALIGNED_PTR(node, MEMORY_ALLOCATION_ALIGNMENT), + { + PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, stack)); + return PJ_EINVALIDOP; + }); +#endif //PJ_STACK_ALIGN_DEBUG + + /*pFirstEntry =*/ InterlockedPushEntrySList(&stack->head, node); + return PJ_SUCCESS; +} + + +PJ_DEF(pj_stack_t*) pj_stack_pop(pj_stack_type *stack) +{ +#ifdef PJ_STACK_ALIGN_DEBUG + PJ_ASSERT_RETURN(stack, NULL); + PJ_ASSERT_ON_FAIL(IS_ALIGNED_PTR(&stack->head, MEMORY_ALLOCATION_ALIGNMENT), + { + PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, stack)); + return NULL; + }); +#endif //PJ_STACK_ALIGN_DEBUG + + return InterlockedPopEntrySList(&stack->head); +} + +/** + * Get the stack's elements quantity. + * The return value of pj_stack_size should not be relied upon in multithreaded applications + * because the item count can be changed at any time by another thread. + * For Windows platform returns the number of entries in the stack modulo 65535. For example, + * if the specified stack contains 65536 entries, pj_stack_size returns zero. + * + * @param stack The target stack. + * + * @return Number of elements. + */ +PJ_DEF(pj_size_t) pj_stack_size(/*const*/ pj_stack_type *stack) +{ +#ifdef PJ_STACK_ALIGN_DEBUG + PJ_ASSERT_RETURN(stack, 0); + PJ_ASSERT_ON_FAIL(IS_ALIGNED_PTR(&stack->head, MEMORY_ALLOCATION_ALIGNMENT), + { + PJ_LOG(1, (THIS_FILE, "Windows platform's pj_stack implementation requires alignment not less than %d (stc%p).", MEMORY_ALLOCATION_ALIGNMENT, stack)); + return 0; + }); +#endif //PJ_STACK_ALIGN_DEBUG + + return QueryDepthSList(&stack->head); +} From bb1307d6abd3d69fd6fa3adcfb6bf6d5cd6fed26 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Thu, 12 Dec 2024 21:51:55 +0100 Subject: [PATCH 31/33] unrelated... --- pjlib/build/pjlib.vcxproj.filters | 3 --- 1 file changed, 3 deletions(-) diff --git a/pjlib/build/pjlib.vcxproj.filters b/pjlib/build/pjlib.vcxproj.filters index d86856eb54..b2dd2f20bd 100644 --- a/pjlib/build/pjlib.vcxproj.filters +++ b/pjlib/build/pjlib.vcxproj.filters @@ -224,9 +224,6 @@ Source Files - - Source Files - Source Files From 9841571d7853d1fc92f8801767d6265f1f3c8f94 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Fri, 13 Dec 2024 20:32:25 +0100 Subject: [PATCH 32/33] little formal changes --- pjlib/include/pj/stack.h | 11 +++++------ pjlib/src/pj/stack.c | 6 ------ pjlib/src/pj/stack_win32.c | 4 ---- pjlib/src/pjlib-test/stack.c | 11 +++++++++++ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pjlib/include/pj/stack.h b/pjlib/include/pj/stack.h index 6e9cf32611..da68ce5258 100644 --- a/pjlib/include/pj/stack.h +++ b/pjlib/include/pj/stack.h @@ -47,8 +47,6 @@ #endif // PJ_STACK_IMPLEMENTATION -#include - PJ_BEGIN_DECL @@ -64,7 +62,7 @@ PJ_BEGIN_DECL * Stack in PJLIB is single-linked list with First In Last Out logic. * Stack is thread safe. Common PJLIB stack implementation uses internal locking mechanism so is thread-safe. * Implementation for Windows platform uses locking free Windows embeded single linked list implementation. - * The performance of pj_stack implementation for Windows platform is 2-5x higher than cross-platform. + * The performance of pj_stack implementation for Windows platform is considerably higher than cross-platform. * * By default pjlib compile and link os independent "cross-platform" implementation. * To select implementation you may optionaly define PJ_STACK_IMPLEMENTATION as PJ_STACK_WIN32 @@ -77,13 +75,14 @@ PJ_BEGIN_DECL * * Windows single linked list implementation requires aligned data, both stack item and stack itself should * be aligned by 8 (for x86) or 16 (for x64) byte. - * pjsip build system define PJ_POOL_ALIGNMENT macro to corresponding value. * winnt.h define MEMORY_ALLOCATION_ALIGNMENT macro for this purpose. - * To use this macro in build system we recomend (this is optional) to add #include - * to your config_site.h. + * pjsip build system define PJ_POOL_ALIGNMENT macro to corresponding value. * You may redefine PJ_POOL_ALIGNMENT in your config_site.h but to use PJ_STACK_WIN32 implementation * PJ_POOL_ALIGNMENTshould not be less then MEMORY_ALLOCATION_ALIGNMENT * + * To use MEMORY_ALLOCATION_ALIGNMENT macro in build system we recomend (this is optional) to add + * #include to your config_site.h. + * * Stack won't require dynamic memory allocation (just as all PJLIB data structures). The stack here * should be viewed more like a low level C stack instead of high level C++ stack * (which normally are easier to use but require dynamic memory allocations), diff --git a/pjlib/src/pj/stack.c b/pjlib/src/pj/stack.c index f0d99db880..624f53ecde 100644 --- a/pjlib/src/pj/stack.c +++ b/pjlib/src/pj/stack.c @@ -143,12 +143,6 @@ PJ_DEF(pj_stack_t*) pj_stack_pop(pj_stack_type *stack) * Traverse the stack and get it's elements quantity. * The return value of pj_stack_size should not be relied upon in multithreaded applications * because the item count can be changed at any time by another thread. - * For Windows platform returns the number of entries in the stack modulo 65535. For example, - * if the specified stack contains 65536 entries, pj_stack_size returns zero. - * - * @param stack The target stack. - * - * @return Number of elements. */ PJ_DEF(pj_size_t) pj_stack_size(/*const*/ pj_stack_type *stack) { diff --git a/pjlib/src/pj/stack_win32.c b/pjlib/src/pj/stack_win32.c index 0335e3adba..f315dcb6f8 100644 --- a/pjlib/src/pj/stack_win32.c +++ b/pjlib/src/pj/stack_win32.c @@ -140,10 +140,6 @@ PJ_DEF(pj_stack_t*) pj_stack_pop(pj_stack_type *stack) * because the item count can be changed at any time by another thread. * For Windows platform returns the number of entries in the stack modulo 65535. For example, * if the specified stack contains 65536 entries, pj_stack_size returns zero. - * - * @param stack The target stack. - * - * @return Number of elements. */ PJ_DEF(pj_size_t) pj_stack_size(/*const*/ pj_stack_type *stack) { diff --git a/pjlib/src/pjlib-test/stack.c b/pjlib/src/pjlib-test/stack.c index 3bb6c811a8..ed16d5f5a0 100644 --- a/pjlib/src/pjlib-test/stack.c +++ b/pjlib/src/pjlib-test/stack.c @@ -51,6 +51,15 @@ #endif +/* define this variable to control multithreaded testing for other platforms */ +#ifndef HAS_MT_STACK_STRESS_TEST +# ifdef PJ_WIN32 +# define HAS_MT_STACK_STRESS_TEST 1 +# endif +# define HAS_MT_STACK_STRESS_TEST 0 +# endif +#endif + #define THIS_FILE "stack.c" #define MAX_RESERVED 16 #define MAX_SLOTS 100 @@ -215,10 +224,12 @@ int stack_test() rc = -55; } +#ifdef HAS_MT_STACK_STRESS_TEST for (i = 0; !rc && i < PJ_ARRAY_SIZE(tests); ++i) { tests[i].state.pool = pool; rc = stack_stress_test(&tests[i]); } +#endif //HAS_MT_STACK_STRESS_TEST if (pool) pj_pool_release(pool); From a102249c0255769510717bae23d095f253a585b8 Mon Sep 17 00:00:00 2001 From: Leonid Goltsblat Date: Fri, 13 Dec 2024 21:31:54 +0100 Subject: [PATCH 33/33] fix --- pjlib/src/pjlib-test/stack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pjlib/src/pjlib-test/stack.c b/pjlib/src/pjlib-test/stack.c index ed16d5f5a0..d264bd546a 100644 --- a/pjlib/src/pjlib-test/stack.c +++ b/pjlib/src/pjlib-test/stack.c @@ -55,7 +55,7 @@ #ifndef HAS_MT_STACK_STRESS_TEST # ifdef PJ_WIN32 # define HAS_MT_STACK_STRESS_TEST 1 -# endif +# else # define HAS_MT_STACK_STRESS_TEST 0 # endif #endif