Ignore:
Timestamp:
Jan 23, 2017 4:32:34 AM (8 years ago)
Author:
nanang
Message:

Re #1900: Reintegrated works in UWP branch to trunk.

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk

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

    r5415 r5539  
    22<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 
    33  <ItemGroup Label="ProjectConfigurations"> 
     4    <ProjectConfiguration Include="Debug-Dynamic|ARM"> 
     5      <Configuration>Debug-Dynamic</Configuration> 
     6      <Platform>ARM</Platform> 
     7    </ProjectConfiguration> 
    48    <ProjectConfiguration Include="Debug-Dynamic|Win32"> 
    59      <Configuration>Debug-Dynamic</Configuration> 
    … …  
    1014      <Platform>x64</Platform> 
    1115    </ProjectConfiguration> 
     16    <ProjectConfiguration Include="Debug-Static|ARM"> 
     17      <Configuration>Debug-Static</Configuration> 
     18      <Platform>ARM</Platform> 
     19    </ProjectConfiguration> 
    1220    <ProjectConfiguration Include="Debug-Static|Win32"> 
    1321      <Configuration>Debug-Static</Configuration> 
    … …  
    1826      <Platform>x64</Platform> 
    1927    </ProjectConfiguration> 
     28    <ProjectConfiguration Include="Debug|ARM"> 
     29      <Configuration>Debug</Configuration> 
     30      <Platform>ARM</Platform> 
     31    </ProjectConfiguration> 
    2032    <ProjectConfiguration Include="Debug|Win32"> 
    2133      <Configuration>Debug</Configuration> 
    … …  
    2638      <Platform>x64</Platform> 
    2739    </ProjectConfiguration> 
     40    <ProjectConfiguration Include="Release-Dynamic|ARM"> 
     41      <Configuration>Release-Dynamic</Configuration> 
     42      <Platform>ARM</Platform> 
     43    </ProjectConfiguration> 
    2844    <ProjectConfiguration Include="Release-Dynamic|Win32"> 
    2945      <Configuration>Release-Dynamic</Configuration> 
    … …  
    3450      <Platform>x64</Platform> 
    3551    </ProjectConfiguration> 
     52    <ProjectConfiguration Include="Release-Static|ARM"> 
     53      <Configuration>Release-Static</Configuration> 
     54      <Platform>ARM</Platform> 
     55    </ProjectConfiguration> 
    3656    <ProjectConfiguration Include="Release-Static|Win32"> 
    3757      <Configuration>Release-Static</Configuration> 
    … …  
    4262      <Platform>x64</Platform> 
    4363    </ProjectConfiguration> 
     64    <ProjectConfiguration Include="Release|ARM"> 
     65      <Configuration>Release</Configuration> 
     66      <Platform>ARM</Platform> 
     67    </ProjectConfiguration> 
    4468    <ProjectConfiguration Include="Release|Win32"> 
    4569      <Configuration>Release</Configuration> 
    … …  
    5175    </ProjectConfiguration> 
    5276  </ItemGroup> 
     77  <!-- Import common config --> 
     78  <Import Project="..\..\..\build\vs\pjproject-vs14-common-config.props" /> 
    5379  <PropertyGroup Label="Globals"> 
    5480    <ProjectGuid>{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}</ProjectGuid> 
    5581    <RootNamespace>libsrtp</RootNamespace> 
    5682    <Keyword>Win32Proj</Keyword> 
     83    <!-- Specific UWP property --> 
     84    <DefaultLanguage>en-US</DefaultLanguage> 
    5785  </PropertyGroup> 
    5886  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 
    … …  
    6290    <CharacterSet>MultiByte</CharacterSet> 
    6391  </PropertyGroup> 
     92  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="Configuration"> 
     93    <ConfigurationType>StaticLibrary</ConfigurationType> 
     94    <PlatformToolset>v140</PlatformToolset> 
     95    <CharacterSet>MultiByte</CharacterSet> 
     96  </PropertyGroup> 
    6497  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="Configuration"> 
    6598    <ConfigurationType>StaticLibrary</ConfigurationType> 
    … …  
    67100    <CharacterSet>MultiByte</CharacterSet> 
    68101  </PropertyGroup> 
     102  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="Configuration"> 
     103    <ConfigurationType>StaticLibrary</ConfigurationType> 
     104    <PlatformToolset>v140</PlatformToolset> 
     105    <CharacterSet>MultiByte</CharacterSet> 
     106  </PropertyGroup> 
    69107  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="Configuration"> 
    70108    <ConfigurationType>StaticLibrary</ConfigurationType> 
    … …  
    72110    <CharacterSet>MultiByte</CharacterSet> 
    73111  </PropertyGroup> 
     112  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="Configuration"> 
     113    <ConfigurationType>StaticLibrary</ConfigurationType> 
     114    <PlatformToolset>v140</PlatformToolset> 
     115    <CharacterSet>MultiByte</CharacterSet> 
     116  </PropertyGroup> 
    74117  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="Configuration"> 
    75118    <ConfigurationType>StaticLibrary</ConfigurationType> 
    … …  
    77120    <CharacterSet>MultiByte</CharacterSet> 
    78121  </PropertyGroup> 
     122  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="Configuration"> 
     123    <ConfigurationType>StaticLibrary</ConfigurationType> 
     124    <PlatformToolset>v140</PlatformToolset> 
     125    <CharacterSet>MultiByte</CharacterSet> 
     126  </PropertyGroup> 
    79127  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 
    80128    <ConfigurationType>StaticLibrary</ConfigurationType> 
    … …  
    82130    <CharacterSet>MultiByte</CharacterSet> 
    83131  </PropertyGroup> 
     132  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> 
     133    <ConfigurationType>StaticLibrary</ConfigurationType> 
     134    <PlatformToolset>v140</PlatformToolset> 
     135    <CharacterSet>MultiByte</CharacterSet> 
     136  </PropertyGroup> 
    84137  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 
    85138    <ConfigurationType>StaticLibrary</ConfigurationType> 
    … …  
    87140    <CharacterSet>MultiByte</CharacterSet> 
    88141  </PropertyGroup> 
     142  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> 
     143    <ConfigurationType>StaticLibrary</ConfigurationType> 
     144    <PlatformToolset>v140</PlatformToolset> 
     145    <CharacterSet>MultiByte</CharacterSet> 
     146  </PropertyGroup> 
    89147  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration"> 
    90148    <ConfigurationType>StaticLibrary</ConfigurationType> 
    … …  
    116174    <PlatformToolset>v140</PlatformToolset> 
    117175    <CharacterSet>MultiByte</CharacterSet> 
     176  </PropertyGroup> 
     177  <!-- Override the PlatformToolset --> 
     178  <PropertyGroup> 
     179    <PlatformToolset>$(BuildToolset)</PlatformToolset> 
     180    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"> 
     181    </CharacterSet> 
    118182  </PropertyGroup> 
    119183  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 
    … …  
    125189    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
    126190  </ImportGroup> 
     191  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="PropertySheets"> 
     192    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     193    <Import Project="..\..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 
     194    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
     195  </ImportGroup> 
    127196  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets"> 
    128197    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    … …  
    130199    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    131200  </ImportGroup> 
     201  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="PropertySheets"> 
     202    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     203    <Import Project="..\..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 
     204    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     205  </ImportGroup> 
    132206  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> 
    133207    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    … …  
    135209    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    136210  </ImportGroup> 
     211  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> 
     212    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     213    <Import Project="..\..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 
     214    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     215  </ImportGroup> 
    137216  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets"> 
    138217    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    … …  
    140219    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
    141220  </ImportGroup> 
     221  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="PropertySheets"> 
     222    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     223    <Import Project="..\..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 
     224    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
     225  </ImportGroup> 
    142226  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets"> 
    143227    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    … …  
    145229    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    146230  </ImportGroup> 
     231  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="PropertySheets"> 
     232    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     233    <Import Project="..\..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 
     234    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     235  </ImportGroup> 
    147236  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> 
    148237    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    149238    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     239    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     240  </ImportGroup> 
     241  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> 
     242    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     243    <Import Project="..\..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 
    150244    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    151245  </ImportGroup> 
    … …  
    185279    <OutDir>..\..\lib\</OutDir> 
    186280  </PropertyGroup> 
     281  <!-- Compile and link option definition --> 
     282  <ItemDefinitionGroup> 
     283    <ClCompile> 
     284      <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> 
     285    </ClCompile> 
     286  </ItemDefinitionGroup> 
    187287  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 
    188288    <ClCompile> 
    … …  
    190290      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    191291      <PrecompiledHeaderOutputFile /> 
     292    </ClCompile> 
     293    <Lib> 
     294      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     295    </Lib> 
     296  </ItemDefinitionGroup> 
     297  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> 
     298    <ClCompile> 
     299      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     300      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     301      <PrecompiledHeaderOutputFile> 
     302      </PrecompiledHeaderOutputFile> 
    192303    </ClCompile> 
    193304    <Lib> 
    … …  
    219330    </Lib> 
    220331  </ItemDefinitionGroup> 
     332  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> 
     333    <ClCompile> 
     334      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     335      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     336      <PrecompiledHeaderOutputFile> 
     337      </PrecompiledHeaderOutputFile> 
     338    </ClCompile> 
     339    <Lib> 
     340      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     341    </Lib> 
     342  </ItemDefinitionGroup> 
    221343  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 
    222344    <Midl> 
    … …  
    242364    </Lib> 
    243365  </ItemDefinitionGroup> 
     366  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> 
     367    <ClCompile> 
     368      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     369      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     370      <PrecompiledHeaderOutputFile> 
     371      </PrecompiledHeaderOutputFile> 
     372    </ClCompile> 
     373    <Lib> 
     374      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     375    </Lib> 
     376  </ItemDefinitionGroup> 
    244377  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'"> 
    245378    <Midl> 
    … …  
    266399    </Lib> 
    267400  </ItemDefinitionGroup> 
     401  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> 
     402    <ClCompile> 
     403      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     404      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     405      <PrecompiledHeaderOutputFile> 
     406      </PrecompiledHeaderOutputFile> 
     407    </ClCompile> 
     408    <Lib> 
     409      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     410    </Lib> 
     411  </ItemDefinitionGroup> 
    268412  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'"> 
    269413    <Midl> 
    … …  
    289433    </Lib> 
    290434  </ItemDefinitionGroup> 
     435  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> 
     436    <ClCompile> 
     437      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     438      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     439      <PrecompiledHeaderOutputFile> 
     440      </PrecompiledHeaderOutputFile> 
     441    </ClCompile> 
     442    <Lib> 
     443      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     444    </Lib> 
     445  </ItemDefinitionGroup> 
    291446  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'"> 
    292447    <Midl> 
    … …  
    308463      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    309464      <PrecompiledHeaderOutputFile /> 
     465    </ClCompile> 
     466    <Lib> 
     467      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     468    </Lib> 
     469  </ItemDefinitionGroup> 
     470  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> 
     471    <ClCompile> 
     472      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     473      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     474      <PrecompiledHeaderOutputFile> 
     475      </PrecompiledHeaderOutputFile> 
    310476    </ClCompile> 
    311477    <Lib> 
    … …  
    379545    <ClCompile Include="..\..\srtp\crypto\hash\sha1.c" /> 
    380546    <ClCompile Include="..\..\srtp\crypto\kernel\alloc.c" /> 
    381     <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> 
    382551    <ClCompile Include="..\..\srtp\crypto\kernel\key.c" /> 
    383552    <ClCompile Include="..\..\srtp\crypto\math\datatypes.c" /> 
Note: See TracChangeset for help on using the changeset viewer.