Changeset 5415


Ignore:
Timestamp:
Aug 9, 2016 2:57:05 AM (3 years ago)
Author:
ming
Message:

Fixed #1943: (Windows) Add SRTP OpenSSL sources in Visual Studio libsrtp project file.

Location:
pjproject/trunk/third_party/build/srtp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/third_party/build/srtp/libsrtp.vcxproj

    r5266 r5415  
    127127  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets"> 
    128128    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    129         <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
    130     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />     
     129    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     130    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    131131  </ImportGroup> 
    132132  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> 
     
    142142  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets"> 
    143143    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    144         <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
    145     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />     
     144    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     145    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    146146  </ImportGroup> 
    147147  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> 
    148148    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    149         <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
    150     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />     
     149    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     150    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    151151  </ImportGroup> 
    152152  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets"> 
    153153    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    154         <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />    
    155         <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
     154    <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
     155    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
    156156  </ImportGroup> 
    157157  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets"> 
    158158    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    159         <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
    160     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />     
     159    <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
     160    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    161161  </ImportGroup> 
    162162  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> 
    163163    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    164         <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
    165     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />     
     164    <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     165    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    166166  </ImportGroup> 
    167167  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets"> 
    168168    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    169         <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
    170     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />     
     169    <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     170    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
    171171  </ImportGroup> 
    172172  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets"> 
    173173    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    174         <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
    175     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />     
     174    <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     175    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    176176  </ImportGroup> 
    177177  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> 
    178178    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    179         <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
    180     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />     
     179    <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
     180    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    181181  </ImportGroup> 
    182182  <PropertyGroup Label="UserMacros" /> 
    183183  <PropertyGroup> 
    184184    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> 
    185         <OutDir>..\..\lib\</OutDir> 
     185    <OutDir>..\..\lib\</OutDir> 
    186186  </PropertyGroup> 
    187187  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 
     
    326326    </Lib> 
    327327  </ItemDefinitionGroup> 
    328   <ItemGroup>     
     328  <ItemGroup> 
    329329    <ClCompile Include="..\..\srtp\crypto\cipher\aes.c" /> 
    330330    <ClCompile Include="..\..\srtp\crypto\cipher\aes_cbc.c" /> 
     331    <ClCompile Include="..\..\srtp\crypto\cipher\aes_gcm_ossl.c"> 
     332      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 
     333      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 
     334      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 
     335      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 
     336      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 
     337      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 
     338      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 
     339      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 
     340      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 
     341      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 
     342      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 
     343      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 
     344    </ClCompile> 
    331345    <ClCompile Include="..\..\srtp\crypto\cipher\aes_icm.c" /> 
     346    <ClCompile Include="..\..\srtp\crypto\cipher\aes_icm_ossl.c"> 
     347      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 
     348      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 
     349      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 
     350      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 
     351      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 
     352      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 
     353      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 
     354      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 
     355      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 
     356      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 
     357      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 
     358      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 
     359    </ClCompile> 
    332360    <ClCompile Include="..\..\srtp\crypto\cipher\cipher.c" /> 
    333361    <ClCompile Include="..\..\srtp\crypto\cipher\null_cipher.c" /> 
    334362    <ClCompile Include="..\..\srtp\crypto\hash\auth.c" /> 
    335363    <ClCompile Include="..\..\srtp\crypto\hash\hmac.c" /> 
     364    <ClCompile Include="..\..\srtp\crypto\hash\hmac_ossl.c"> 
     365      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 
     366      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 
     367      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 
     368      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 
     369      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 
     370      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 
     371      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 
     372      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 
     373      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 
     374      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 
     375      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 
     376      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 
     377    </ClCompile> 
    336378    <ClCompile Include="..\..\srtp\crypto\hash\null_auth.c" /> 
    337379    <ClCompile Include="..\..\srtp\crypto\hash\sha1.c" /> 
     
    347389    <ClCompile Include="..\..\srtp\crypto\rng\prng.c" /> 
    348390    <ClCompile Include="..\..\srtp\crypto\rng\rand_source.c" /> 
     391    <ClCompile Include="..\..\srtp\crypto\rng\rand_source_ossl.c"> 
     392      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 
     393      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 
     394      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 
     395      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 
     396      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 
     397      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 
     398      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 
     399      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 
     400      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 
     401      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 
     402      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 
     403      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 
     404    </ClCompile> 
    349405    <ClCompile Include="..\..\srtp\pjlib\srtp_err.c" /> 
    350406    <ClCompile Include="..\..\srtp\srtp\srtp.c" /> 
    351407    <ClCompile Include="..\..\srtp\srtp\ekt.c" /> 
    352408  </ItemGroup> 
    353   <ItemGroup>     
     409  <ItemGroup> 
    354410    <ClInclude Include="..\..\srtp\crypto\include\aes.h" /> 
    355411    <ClInclude Include="..\..\srtp\crypto\include\aes_cbc.h" /> 
  • pjproject/trunk/third_party/build/srtp/libsrtp.vcxproj.filters

    r5266 r5415  
    105105      <Filter>Source Files</Filter> 
    106106    </ClCompile> 
    107     <ClCompile Include="..\..\srtp\include\ekt.h"> 
    108       <Filter>Header Files</Filter> 
     107    <ClCompile Include="..\..\srtp\crypto\cipher\aes_icm_ossl.c"> 
     108      <Filter>crypto\cipher</Filter> 
     109    </ClCompile> 
     110    <ClCompile Include="..\..\srtp\crypto\cipher\aes_gcm_ossl.c"> 
     111      <Filter>crypto\cipher</Filter> 
     112    </ClCompile> 
     113    <ClCompile Include="..\..\srtp\crypto\hash\hmac_ossl.c"> 
     114      <Filter>crypto\hash</Filter> 
     115    </ClCompile> 
     116    <ClCompile Include="..\..\srtp\crypto\rng\rand_source_ossl.c"> 
     117      <Filter>crypto\rng</Filter> 
    109118    </ClCompile> 
    110119  </ItemGroup> 
     
    200209      <Filter>crypto\include</Filter> 
    201210    </ClInclude> 
     211    <ClInclude Include="..\..\srtp\include\ekt.h"> 
     212      <Filter>Header Files</Filter> 
     213    </ClInclude> 
    202214  </ItemGroup> 
    203215</Project> 
Note: See TracChangeset for help on using the changeset viewer.