Ignore:
Timestamp:
Dec 28, 2016 5:20:16 AM (8 years ago)
Author:
riza
Message:

Re #1900: Fix merge conflict for solution file and project files. And fix some compile error found for UWP.

Location:
pjproject/branches/projects/uwp
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • pjproject/branches/projects/uwp

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • pjproject/branches/projects/uwp/third_party/build/srtp/libsrtp.vcxproj

    r5497 r5514  
    178178  <PropertyGroup> 
    179179    <PlatformToolset>$(BuildToolset)</PlatformToolset> 
    180     <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet> 
     180    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"> 
     181    </CharacterSet> 
    181182  </PropertyGroup> 
    182183  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 
    … …  
    276277  <PropertyGroup> 
    277278    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> 
    278     <OutDir>..\..\lib\</OutDir>     
     279    <OutDir>..\..\lib\</OutDir> 
    279280  </PropertyGroup> 
    280281  <!-- Compile and link option definition --> 
    … …  
    287288    <ClCompile> 
    288289      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    289       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     290      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    290291      <PrecompiledHeaderOutputFile /> 
    291292    </ClCompile> 
    … …  
    311312    <ClCompile> 
    312313      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    313       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     314      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    314315      <PrecompiledHeaderOutputFile /> 
    315316      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 
    … …  
    322323    <ClCompile> 
    323324      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    324       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     325      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    325326      <PrecompiledHeaderOutputFile /> 
    326327    </ClCompile> 
    … …  
    346347    <ClCompile> 
    347348      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    348       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     349      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    349350      <PrecompiledHeaderOutputFile /> 
    350351    </ClCompile> 
    … …  
    356357    <ClCompile> 
    357358      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    358       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     359      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    359360      <PrecompiledHeaderOutputFile /> 
    360361    </ClCompile> 
    … …  
    380381    <ClCompile> 
    381382      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    382       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     383      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    383384      <PrecompiledHeaderOutputFile /> 
    384385      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 
    … …  
    391392    <ClCompile> 
    392393      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    393       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     394      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    394395      <PrecompiledHeaderOutputFile /> 
    395396    </ClCompile> 
    … …  
    415416    <ClCompile> 
    416417      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    417       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     418      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    418419      <PrecompiledHeaderOutputFile /> 
    419420    </ClCompile> 
    … …  
    425426    <ClCompile> 
    426427      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    427       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     428      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    428429      <PrecompiledHeaderOutputFile /> 
    429430    </ClCompile> 
    … …  
    449450    <ClCompile> 
    450451      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    451       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     452      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    452453      <PrecompiledHeaderOutputFile /> 
    453454      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 
    … …  
    460461    <ClCompile> 
    461462      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    462       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     463      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    463464      <PrecompiledHeaderOutputFile /> 
    464465    </ClCompile> 
    … …  
    484485    <ClCompile> 
    485486      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    486       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     487      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    487488      <PrecompiledHeaderOutputFile /> 
    488489    </ClCompile> 
    … …  
    492493  </ItemDefinitionGroup> 
    493494  <ItemGroup> 
    494     <ClCompile Include="..\..\srtp\crypto\ae_xfm\xfm.c" /> 
    495495    <ClCompile Include="..\..\srtp\crypto\cipher\aes.c" /> 
    496496    <ClCompile Include="..\..\srtp\crypto\cipher\aes_cbc.c" /> 
     497    <ClCompile Include="..\..\srtp\crypto\cipher\aes_gcm_ossl.c"> 
     498      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 
     499      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 
     500      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 
     501      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 
     502      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 
     503      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 
     504      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 
     505      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 
     506      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 
     507      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 
     508      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 
     509      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 
     510    </ClCompile> 
    497511    <ClCompile Include="..\..\srtp\crypto\cipher\aes_icm.c" /> 
     512    <ClCompile Include="..\..\srtp\crypto\cipher\aes_icm_ossl.c"> 
     513      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 
     514      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 
     515      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 
     516      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 
     517      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 
     518      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 
     519      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 
     520      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 
     521      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 
     522      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 
     523      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 
     524      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 
     525    </ClCompile> 
    498526    <ClCompile Include="..\..\srtp\crypto\cipher\cipher.c" /> 
    499527    <ClCompile Include="..\..\srtp\crypto\cipher\null_cipher.c" /> 
    500528    <ClCompile Include="..\..\srtp\crypto\hash\auth.c" /> 
    501529    <ClCompile Include="..\..\srtp\crypto\hash\hmac.c" /> 
     530    <ClCompile Include="..\..\srtp\crypto\hash\hmac_ossl.c"> 
     531      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 
     532      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 
     533      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 
     534      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 
     535      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 
     536      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 
     537      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 
     538      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 
     539      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 
     540      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 
     541      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 
     542      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 
     543    </ClCompile> 
    502544    <ClCompile Include="..\..\srtp\crypto\hash\null_auth.c" /> 
    503545    <ClCompile Include="..\..\srtp\crypto\hash\sha1.c" /> 
    504546    <ClCompile Include="..\..\srtp\crypto\kernel\alloc.c" /> 
    505     <ClCompile Include="..\..\srtp\crypto\kernel\crypto_kernel.c" /> 
     547    <ClCompile Include="..\..\srtp\crypto\kernel\crypto_kernel.c"> 
     548      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 
     549      </DisableSpecificWarnings> 
     550    </ClCompile> 
    506551    <ClCompile Include="..\..\srtp\crypto\kernel\key.c" /> 
    507552    <ClCompile Include="..\..\srtp\crypto\math\datatypes.c" /> 
    … …  
    513558    <ClCompile Include="..\..\srtp\crypto\rng\prng.c" /> 
    514559    <ClCompile Include="..\..\srtp\crypto\rng\rand_source.c" /> 
     560    <ClCompile Include="..\..\srtp\crypto\rng\rand_source_ossl.c"> 
     561      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 
     562      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 
     563      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 
     564      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 
     565      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 
     566      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 
     567      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 
     568      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 
     569      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 
     570      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 
     571      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 
     572      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 
     573    </ClCompile> 
    515574    <ClCompile Include="..\..\srtp\pjlib\srtp_err.c" /> 
    516575    <ClCompile Include="..\..\srtp\srtp\srtp.c" /> 
     576    <ClCompile Include="..\..\srtp\srtp\ekt.c" /> 
    517577  </ItemGroup> 
    518578  <ItemGroup> 
    … …  
    543603    <ClInclude Include="..\..\srtp\crypto\include\sha1.h" /> 
    544604    <ClInclude Include="..\..\srtp\crypto\include\stat.h" /> 
    545     <ClInclude Include="..\..\srtp\crypto\include\xfm.h" /> 
     605    <ClInclude Include="..\..\srtp\include\ekt.h" /> 
    546606    <ClInclude Include="..\..\srtp\include\rtp.h" /> 
    547607    <ClInclude Include="..\..\srtp\include\srtp.h" /> 
Note: See TracChangeset for help on using the changeset viewer.