diff options
author | Riza Sulistyo <riza@teluu.com> | 2016-03-18 07:09:21 +0000 |
---|---|---|
committer | Riza Sulistyo <riza@teluu.com> | 2016-03-18 07:09:21 +0000 |
commit | fa5a50bd39891482fed15beda08e02796bf2029b (patch) | |
tree | 448071f5f5bb790615208615b5b0f79b6584d228 | |
parent | 61dc0f0c1c1562a6ff9f478eb1463b65f79c598b (diff) |
Re #1847: Fixed VS2015 project file and filters.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5266 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r-- | third_party/build/srtp/libsrtp.vcxproj | 32 | ||||
-rw-r--r-- | third_party/build/srtp/libsrtp.vcxproj.filters | 15 |
2 files changed, 22 insertions, 25 deletions
diff --git a/third_party/build/srtp/libsrtp.vcxproj b/third_party/build/srtp/libsrtp.vcxproj index d4dfae4f..9db5c0bd 100644 --- a/third_party/build/srtp/libsrtp.vcxproj +++ b/third_party/build/srtp/libsrtp.vcxproj @@ -187,7 +187,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile /> </ClCompile> <Lib> @@ -200,7 +200,7 @@ </Midl> <ClCompile> <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile /> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> @@ -211,7 +211,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile /> </ClCompile> <Lib> @@ -224,7 +224,7 @@ </Midl> <ClCompile> <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile /> </ClCompile> <Lib> @@ -234,7 +234,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'"> <ClCompile> <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile /> </ClCompile> <Lib> @@ -247,7 +247,7 @@ </Midl> <ClCompile> <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile /> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> @@ -258,7 +258,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'"> <ClCompile> <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile /> </ClCompile> <Lib> @@ -271,7 +271,7 @@ </Midl> <ClCompile> <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile /> </ClCompile> <Lib> @@ -281,7 +281,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'"> <ClCompile> <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile /> </ClCompile> <Lib> @@ -294,7 +294,7 @@ </Midl> <ClCompile> <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile /> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> @@ -305,7 +305,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'"> <ClCompile> <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile /> </ClCompile> <Lib> @@ -318,15 +318,14 @@ </Midl> <ClCompile> <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile /> </ClCompile> <Lib> <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> </Lib> </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\..\srtp\crypto\ae_xfm\xfm.c" /> + <ItemGroup> <ClCompile Include="..\..\srtp\crypto\cipher\aes.c" /> <ClCompile Include="..\..\srtp\crypto\cipher\aes_cbc.c" /> <ClCompile Include="..\..\srtp\crypto\cipher\aes_icm.c" /> @@ -349,8 +348,9 @@ <ClCompile Include="..\..\srtp\crypto\rng\rand_source.c" /> <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" /> @@ -377,7 +377,7 @@ <ClInclude Include="..\..\srtp\crypto\include\rdbx.h" /> <ClInclude Include="..\..\srtp\crypto\include\sha1.h" /> <ClInclude Include="..\..\srtp\crypto\include\stat.h" /> - <ClInclude Include="..\..\srtp\crypto\include\xfm.h" /> + <ClInclude Include="..\..\srtp\include\ekt.h" /> <ClInclude Include="..\..\srtp\include\rtp.h" /> <ClInclude Include="..\..\srtp\include\srtp.h" /> <ClInclude Include="..\..\srtp\include\ut_sim.h" /> diff --git a/third_party/build/srtp/libsrtp.vcxproj.filters b/third_party/build/srtp/libsrtp.vcxproj.filters index 57e16c59..e5cecdd5 100644 --- a/third_party/build/srtp/libsrtp.vcxproj.filters +++ b/third_party/build/srtp/libsrtp.vcxproj.filters @@ -12,9 +12,6 @@ <Filter Include="crypto"> <UniqueIdentifier>{f75b0fc0-2c2f-43cd-b6c9-116b32197c2b}</UniqueIdentifier> </Filter> - <Filter Include="crypto\ae_xfm"> - <UniqueIdentifier>{54f5bab4-bfa9-4c72-b859-693816b56e7f}</UniqueIdentifier> - </Filter> <Filter Include="crypto\cipher"> <UniqueIdentifier>{32730aa3-8eba-44b6-9040-cc5f7d7e9656}</UniqueIdentifier> </Filter> @@ -44,9 +41,6 @@ <ClCompile Include="..\..\srtp\pjlib\srtp_err.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\srtp\crypto\ae_xfm\xfm.c"> - <Filter>crypto\ae_xfm</Filter> - </ClCompile> <ClCompile Include="..\..\srtp\crypto\cipher\aes.c"> <Filter>crypto\cipher</Filter> </ClCompile> @@ -107,6 +101,12 @@ <ClCompile Include="..\..\srtp\crypto\rng\rand_source.c"> <Filter>crypto\rng</Filter> </ClCompile> + <ClCompile Include="..\..\srtp\srtp\ekt.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\srtp\include\ekt.h"> + <Filter>Header Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\srtp\include\rtp.h"> @@ -199,8 +199,5 @@ <ClInclude Include="..\..\srtp\crypto\include\stat.h"> <Filter>crypto\include</Filter> </ClInclude> - <ClInclude Include="..\..\srtp\crypto\include\xfm.h"> - <Filter>crypto\include</Filter> - </ClInclude> </ItemGroup> </Project>
\ No newline at end of file |