Changeset 5266


Ignore:
Timestamp:
Mar 18, 2016 7:09:21 AM (8 years ago)
Author:
riza
Message:

Re #1847: Fixed VS2015 project file and filters.

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

Legend:

Unmodified
Added
Removed

  • pjproject/trunk/third_party/build/srtp/libsrtp.vcxproj

    r5168 r5266  
    188188    <ClCompile> 
    189189      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    190       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     190      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    191191      <PrecompiledHeaderOutputFile /> 
    192192    </ClCompile> 
    … …  
    201201    <ClCompile> 
    202202      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    203       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     203      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    204204      <PrecompiledHeaderOutputFile /> 
    205205      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 
    … …  
    212212    <ClCompile> 
    213213      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    214       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     214      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    215215      <PrecompiledHeaderOutputFile /> 
    216216    </ClCompile> 
    … …  
    225225    <ClCompile> 
    226226      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    227       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     227      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    228228      <PrecompiledHeaderOutputFile /> 
    229229    </ClCompile> 
    … …  
    235235    <ClCompile> 
    236236      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    237       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     237      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    238238      <PrecompiledHeaderOutputFile /> 
    239239    </ClCompile> 
    … …  
    248248    <ClCompile> 
    249249      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    250       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     250      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    251251      <PrecompiledHeaderOutputFile /> 
    252252      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 
    … …  
    259259    <ClCompile> 
    260260      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    261       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     261      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    262262      <PrecompiledHeaderOutputFile /> 
    263263    </ClCompile> 
    … …  
    272272    <ClCompile> 
    273273      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    274       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     274      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    275275      <PrecompiledHeaderOutputFile /> 
    276276    </ClCompile> 
    … …  
    282282    <ClCompile> 
    283283      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    284       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     284      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    285285      <PrecompiledHeaderOutputFile /> 
    286286    </ClCompile> 
    … …  
    295295    <ClCompile> 
    296296      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    297       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     297      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    298298      <PrecompiledHeaderOutputFile /> 
    299299      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 
    … …  
    306306    <ClCompile> 
    307307      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    308       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     308      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    309309      <PrecompiledHeaderOutputFile /> 
    310310    </ClCompile> 
    … …  
    319319    <ClCompile> 
    320320      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    321       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    322       <PrecompiledHeaderOutputFile /> 
    323     </ClCompile> 
    324     <Lib> 
    325       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
    326     </Lib> 
    327   </ItemDefinitionGroup> 
    328   <ItemGroup> 
    329     <ClCompile Include="..\..\srtp\crypto\ae_xfm\xfm.c" /> 
     321      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     322      <PrecompiledHeaderOutputFile /> 
     323    </ClCompile> 
     324    <Lib> 
     325      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     326    </Lib> 
     327  </ItemDefinitionGroup> 
     328  <ItemGroup>     
    330329    <ClCompile Include="..\..\srtp\crypto\cipher\aes.c" /> 
    331330    <ClCompile Include="..\..\srtp\crypto\cipher\aes_cbc.c" /> 
    … …  
    350349    <ClCompile Include="..\..\srtp\pjlib\srtp_err.c" /> 
    351350    <ClCompile Include="..\..\srtp\srtp\srtp.c" /> 
     351    <ClCompile Include="..\..\srtp\srtp\ekt.c" /> 
    352352  </ItemGroup> 
    353   <ItemGroup> 
     353  <ItemGroup>     
    354354    <ClInclude Include="..\..\srtp\crypto\include\aes.h" /> 
    355355    <ClInclude Include="..\..\srtp\crypto\include\aes_cbc.h" /> 
    … …  
    378378    <ClInclude Include="..\..\srtp\crypto\include\sha1.h" /> 
    379379    <ClInclude Include="..\..\srtp\crypto\include\stat.h" /> 
    380     <ClInclude Include="..\..\srtp\crypto\include\xfm.h" /> 
     380    <ClInclude Include="..\..\srtp\include\ekt.h" /> 
    381381    <ClInclude Include="..\..\srtp\include\rtp.h" /> 
    382382    <ClInclude Include="..\..\srtp\include\srtp.h" /> 

  • pjproject/trunk/third_party/build/srtp/libsrtp.vcxproj.filters

    r5181 r5266  
    1313      <UniqueIdentifier>{f75b0fc0-2c2f-43cd-b6c9-116b32197c2b}</UniqueIdentifier> 
    1414    </Filter> 
    15     <Filter Include="crypto\ae_xfm"> 
    16       <UniqueIdentifier>{54f5bab4-bfa9-4c72-b859-693816b56e7f}</UniqueIdentifier> 
    17     </Filter> 
    1815    <Filter Include="crypto\cipher"> 
    1916      <UniqueIdentifier>{32730aa3-8eba-44b6-9040-cc5f7d7e9656}</UniqueIdentifier> 
    … …  
    4542      <Filter>Source Files</Filter> 
    4643    </ClCompile> 
    47     <ClCompile Include="..\..\srtp\crypto\ae_xfm\xfm.c"> 
    48       <Filter>crypto\ae_xfm</Filter> 
    49     </ClCompile> 
    5044    <ClCompile Include="..\..\srtp\crypto\cipher\aes.c"> 
    5145      <Filter>crypto\cipher</Filter> 
    … …  
    107101    <ClCompile Include="..\..\srtp\crypto\rng\rand_source.c"> 
    108102      <Filter>crypto\rng</Filter> 
     103    </ClCompile> 
     104    <ClCompile Include="..\..\srtp\srtp\ekt.c"> 
     105      <Filter>Source Files</Filter> 
     106    </ClCompile> 
     107    <ClCompile Include="..\..\srtp\include\ekt.h"> 
     108      <Filter>Header Files</Filter> 
    109109    </ClCompile> 
    110110  </ItemGroup> 
    … …  
    200200      <Filter>crypto\include</Filter> 
    201201    </ClInclude> 
    202     <ClInclude Include="..\..\srtp\crypto\include\xfm.h"> 
    203       <Filter>crypto\include</Filter> 
    204     </ClInclude> 
    205202  </ItemGroup> 
    206203</Project> 
Note: See TracChangeset for help on using the changeset viewer.