diff options
author | Liong Sauw Ming <ming@teluu.com> | 2016-08-09 02:57:05 +0000 |
---|---|---|
committer | Liong Sauw Ming <ming@teluu.com> | 2016-08-09 02:57:05 +0000 |
commit | d7af10fa68ca47a9283f8645bbbb83c50ebd05f6 (patch) | |
tree | ec97ff5165bdab904afda44d48021750ef63477f | |
parent | 383f6b6e0abeca9c60adb93edff4818bae550c1c (diff) |
Fixed #1943: (Windows) Add SRTP OpenSSL sources in Visual Studio libsrtp project file.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5415 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r-- | third_party/build/srtp/libsrtp.vcxproj | 98 | ||||
-rw-r--r-- | third_party/build/srtp/libsrtp.vcxproj.filters | 16 |
2 files changed, 91 insertions, 23 deletions
diff --git a/third_party/build/srtp/libsrtp.vcxproj b/third_party/build/srtp/libsrtp.vcxproj index 9db5c0bd..f9f56bcd 100644 --- a/third_party/build/srtp/libsrtp.vcxproj +++ b/third_party/build/srtp/libsrtp.vcxproj @@ -126,8 +126,8 @@ </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> - <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -141,48 +141,48 @@ </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> - <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> - <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> - <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> - <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> - <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> - <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> - <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> - <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> - <OutDir>..\..\lib\</OutDir> + <OutDir>..\..\lib\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -325,14 +325,56 @@ <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> </Lib> </ItemDefinitionGroup> - <ItemGroup> + <ItemGroup> <ClCompile Include="..\..\srtp\crypto\cipher\aes.c" /> <ClCompile Include="..\..\srtp\crypto\cipher\aes_cbc.c" /> + <ClCompile Include="..\..\srtp\crypto\cipher\aes_gcm_ossl.c"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> + </ClCompile> <ClCompile Include="..\..\srtp\crypto\cipher\aes_icm.c" /> + <ClCompile Include="..\..\srtp\crypto\cipher\aes_icm_ossl.c"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> + </ClCompile> <ClCompile Include="..\..\srtp\crypto\cipher\cipher.c" /> <ClCompile Include="..\..\srtp\crypto\cipher\null_cipher.c" /> <ClCompile Include="..\..\srtp\crypto\hash\auth.c" /> <ClCompile Include="..\..\srtp\crypto\hash\hmac.c" /> + <ClCompile Include="..\..\srtp\crypto\hash\hmac_ossl.c"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> + </ClCompile> <ClCompile Include="..\..\srtp\crypto\hash\null_auth.c" /> <ClCompile Include="..\..\srtp\crypto\hash\sha1.c" /> <ClCompile Include="..\..\srtp\crypto\kernel\alloc.c" /> @@ -346,11 +388,25 @@ <ClCompile Include="..\..\srtp\crypto\rng\ctr_prng.c" /> <ClCompile Include="..\..\srtp\crypto\rng\prng.c" /> <ClCompile Include="..\..\srtp\crypto\rng\rand_source.c" /> + <ClCompile Include="..\..\srtp\crypto\rng\rand_source_ossl.c"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> + </ClCompile> <ClCompile Include="..\..\srtp\pjlib\srtp_err.c" /> <ClCompile Include="..\..\srtp\srtp\srtp.c" /> <ClCompile Include="..\..\srtp\srtp\ekt.c" /> </ItemGroup> - <ItemGroup> + <ItemGroup> <ClInclude Include="..\..\srtp\crypto\include\aes.h" /> <ClInclude Include="..\..\srtp\crypto\include\aes_cbc.h" /> <ClInclude Include="..\..\srtp\crypto\include\aes_icm.h" /> diff --git a/third_party/build/srtp/libsrtp.vcxproj.filters b/third_party/build/srtp/libsrtp.vcxproj.filters index e5cecdd5..ad25a6df 100644 --- a/third_party/build/srtp/libsrtp.vcxproj.filters +++ b/third_party/build/srtp/libsrtp.vcxproj.filters @@ -104,8 +104,17 @@ <ClCompile Include="..\..\srtp\srtp\ekt.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\srtp\include\ekt.h"> - <Filter>Header Files</Filter> + <ClCompile Include="..\..\srtp\crypto\cipher\aes_icm_ossl.c"> + <Filter>crypto\cipher</Filter> + </ClCompile> + <ClCompile Include="..\..\srtp\crypto\cipher\aes_gcm_ossl.c"> + <Filter>crypto\cipher</Filter> + </ClCompile> + <ClCompile Include="..\..\srtp\crypto\hash\hmac_ossl.c"> + <Filter>crypto\hash</Filter> + </ClCompile> + <ClCompile Include="..\..\srtp\crypto\rng\rand_source_ossl.c"> + <Filter>crypto\rng</Filter> </ClCompile> </ItemGroup> <ItemGroup> @@ -199,5 +208,8 @@ <ClInclude Include="..\..\srtp\crypto\include\stat.h"> <Filter>crypto\include</Filter> </ClInclude> + <ClInclude Include="..\..\srtp\include\ekt.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> </Project>
\ No newline at end of file |