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/pjmedia/build/pjmedia.vcxproj

    r5432 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>{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}</ProjectGuid> 
    5581    <RootNamespace>pjmedia</RootNamespace> 
     82    <DefaultLanguage>en-US</DefaultLanguage> 
     83    <!-- Specific UWP property --> 
     84    <AppContainerApplication Condition="'$(API_Family)'=='UWP'">true</AppContainerApplication> 
     85    <ApplicationType Condition="'$(API_Family)'=='UWP'">Windows Store</ApplicationType> 
     86    <WindowsTargetPlatformVersion Condition="'$(API_Family)'=='UWP'">$(PlatformVersion)</WindowsTargetPlatformVersion> 
     87    <WindowsTargetPlatformMinVersion Condition="'$(API_Family)'=='UWP'">$(PlatformVersion)</WindowsTargetPlatformMinVersion> 
     88    <ApplicationTypeRevision Condition="'$(API_Family)'=='UWP'">$(AppTypeRev)</ApplicationTypeRevision> 
    5689  </PropertyGroup> 
    5790  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 
    … …  
    6295    <CharacterSet>MultiByte</CharacterSet> 
    6396  </PropertyGroup> 
     97  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="Configuration"> 
     98    <ConfigurationType>StaticLibrary</ConfigurationType> 
     99    <PlatformToolset>v140</PlatformToolset> 
     100    <UseOfMfc>false</UseOfMfc> 
     101    <CharacterSet>MultiByte</CharacterSet> 
     102  </PropertyGroup> 
    64103  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="Configuration"> 
    65104    <ConfigurationType>StaticLibrary</ConfigurationType> 
    … …  
    68107    <CharacterSet>MultiByte</CharacterSet> 
    69108  </PropertyGroup> 
     109  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="Configuration"> 
     110    <ConfigurationType>StaticLibrary</ConfigurationType> 
     111    <PlatformToolset>v140</PlatformToolset> 
     112    <UseOfMfc>false</UseOfMfc> 
     113    <CharacterSet>MultiByte</CharacterSet> 
     114  </PropertyGroup> 
    70115  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="Configuration"> 
    71116    <ConfigurationType>StaticLibrary</ConfigurationType> 
    … …  
    74119    <CharacterSet>MultiByte</CharacterSet> 
    75120  </PropertyGroup> 
     121  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="Configuration"> 
     122    <ConfigurationType>StaticLibrary</ConfigurationType> 
     123    <PlatformToolset>v140</PlatformToolset> 
     124    <UseOfMfc>false</UseOfMfc> 
     125    <CharacterSet>MultiByte</CharacterSet> 
     126  </PropertyGroup> 
    76127  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="Configuration"> 
    77128    <ConfigurationType>StaticLibrary</ConfigurationType> 
    … …  
    80131    <CharacterSet>MultiByte</CharacterSet> 
    81132  </PropertyGroup> 
     133  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="Configuration"> 
     134    <ConfigurationType>StaticLibrary</ConfigurationType> 
     135    <PlatformToolset>v140</PlatformToolset> 
     136    <UseOfMfc>false</UseOfMfc> 
     137    <CharacterSet>MultiByte</CharacterSet> 
     138  </PropertyGroup> 
    82139  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 
    83140    <ConfigurationType>StaticLibrary</ConfigurationType> 
    … …  
    86143    <CharacterSet>MultiByte</CharacterSet> 
    87144  </PropertyGroup> 
     145  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> 
     146    <ConfigurationType>StaticLibrary</ConfigurationType> 
     147    <PlatformToolset>v140</PlatformToolset> 
     148    <UseOfMfc>false</UseOfMfc> 
     149    <CharacterSet>MultiByte</CharacterSet> 
     150  </PropertyGroup> 
    88151  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 
    89152    <ConfigurationType>StaticLibrary</ConfigurationType> 
    … …  
    92155    <CharacterSet>MultiByte</CharacterSet> 
    93156  </PropertyGroup> 
     157  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> 
     158    <ConfigurationType>StaticLibrary</ConfigurationType> 
     159    <PlatformToolset>v140</PlatformToolset> 
     160    <UseOfMfc>false</UseOfMfc> 
     161    <CharacterSet>MultiByte</CharacterSet> 
     162  </PropertyGroup> 
    94163  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration"> 
    95164    <ConfigurationType>StaticLibrary</ConfigurationType> 
    … …  
    128197    <CharacterSet>MultiByte</CharacterSet> 
    129198  </PropertyGroup> 
     199  <!-- Override the PlatformToolset --> 
     200  <PropertyGroup> 
     201    <PlatformToolset>$(BuildToolset)</PlatformToolset> 
     202    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet> 
     203  </PropertyGroup>   
    130204  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 
    131205  <ImportGroup Label="ExtensionSettings"> 
    … …  
    136210    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
    137211  </ImportGroup> 
     212  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="PropertySheets"> 
     213    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     214    <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 
     215    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
     216  </ImportGroup> 
    138217  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets"> 
    139218    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    … …  
    141220    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
    142221  </ImportGroup> 
     222  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="PropertySheets"> 
     223    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     224    <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 
     225    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
     226  </ImportGroup> 
    143227  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets"> 
    144228    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    … …  
    146230    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    147231  </ImportGroup> 
     232  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="PropertySheets"> 
     233    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     234    <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 
     235    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     236  </ImportGroup> 
    148237  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets"> 
    149238    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    … …  
    151240    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    152241  </ImportGroup> 
     242  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="PropertySheets"> 
     243    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     244    <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 
     245    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     246  </ImportGroup> 
    153247  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> 
    154248    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    … …  
    156250    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    157251  </ImportGroup> 
     252  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> 
     253    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     254    <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 
     255    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     256  </ImportGroup> 
    158257  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> 
    159258    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    … …  
    161260    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    162261  </ImportGroup> 
     262  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> 
     263    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     264    <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 
     265    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     266  </ImportGroup> 
    163267  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets"> 
    164268    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    … …  
    193297  <PropertyGroup Label="UserMacros" /> 
    194298  <PropertyGroup> 
    195     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> 
    196   </PropertyGroup> 
     299    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>     
     300  </PropertyGroup> 
     301  <!-- Compile and link option definition --> 
     302  <ItemDefinitionGroup> 
     303    <ClCompile> 
     304      <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> 
     305    </ClCompile> 
     306  </ItemDefinitionGroup> 
    197307  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 
    198308    <ClCompile> 
    … …  
    200310      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    201311      <PrecompiledHeaderOutputFile /> 
     312    </ClCompile> 
     313  </ItemDefinitionGroup> 
     314  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> 
     315    <ClCompile> 
     316      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     317      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     318      <PrecompiledHeaderOutputFile> 
     319      </PrecompiledHeaderOutputFile> 
    202320    </ClCompile> 
    203321  </ItemDefinitionGroup> 
    … …  
    219337    </ClCompile> 
    220338  </ItemDefinitionGroup> 
     339  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> 
     340    <ClCompile> 
     341      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     342      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     343      <PrecompiledHeaderOutputFile> 
     344      </PrecompiledHeaderOutputFile> 
     345    </ClCompile> 
     346  </ItemDefinitionGroup> 
    221347  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 
    222348    <Midl> 
    … …  
    237363    </ClCompile> 
    238364  </ItemDefinitionGroup> 
     365  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> 
     366    <ClCompile> 
     367      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     368      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     369      <PrecompiledHeaderOutputFile> 
     370      </PrecompiledHeaderOutputFile> 
     371    </ClCompile> 
     372  </ItemDefinitionGroup> 
    239373  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'"> 
    240374    <Midl> 
    … …  
    255389    </ClCompile> 
    256390  </ItemDefinitionGroup> 
     391  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> 
     392    <ClCompile> 
     393      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     394      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     395      <PrecompiledHeaderOutputFile> 
     396      </PrecompiledHeaderOutputFile> 
     397    </ClCompile> 
     398  </ItemDefinitionGroup> 
    257399  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'"> 
    258400    <Midl> 
    … …  
    272414    </ClCompile> 
    273415  </ItemDefinitionGroup> 
     416  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> 
     417    <ClCompile> 
     418      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     419      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     420      <PrecompiledHeaderOutputFile> 
     421      </PrecompiledHeaderOutputFile> 
     422    </ClCompile> 
     423  </ItemDefinitionGroup> 
    274424  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'"> 
    275425    <Midl> 
    … …  
    288438      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    289439      <PrecompiledHeaderOutputFile /> 
     440    </ClCompile> 
     441  </ItemDefinitionGroup> 
     442  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> 
     443    <ClCompile> 
     444      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     445      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     446      <PrecompiledHeaderOutputFile> 
     447      </PrecompiledHeaderOutputFile> 
    290448    </ClCompile> 
    291449  </ItemDefinitionGroup> 
Note: See TracChangeset for help on using the changeset viewer.