Ignore:
Timestamp:
Jan 23, 2017 4:32:34 AM (4 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_codec.vcxproj

    r5422 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>{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}</ProjectGuid> 
    5581    <RootNamespace>pjmedia_codec</RootNamespace> 
     82    <DefaultLanguage>en-US</DefaultLanguage> 
     83    <!-- Specific UWP property --> 
    5684  </PropertyGroup> 
    5785  <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    <UseOfMfc>false</UseOfMfc> 
     96    <CharacterSet>MultiByte</CharacterSet> 
     97  </PropertyGroup> 
    6498  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="Configuration"> 
    6599    <ConfigurationType>StaticLibrary</ConfigurationType> 
     
    68102    <CharacterSet>MultiByte</CharacterSet> 
    69103  </PropertyGroup> 
     104  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="Configuration"> 
     105    <ConfigurationType>StaticLibrary</ConfigurationType> 
     106    <PlatformToolset>v140</PlatformToolset> 
     107    <UseOfMfc>false</UseOfMfc> 
     108    <CharacterSet>MultiByte</CharacterSet> 
     109  </PropertyGroup> 
    70110  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="Configuration"> 
    71111    <ConfigurationType>StaticLibrary</ConfigurationType> 
     
    74114    <CharacterSet>MultiByte</CharacterSet> 
    75115  </PropertyGroup> 
     116  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="Configuration"> 
     117    <ConfigurationType>StaticLibrary</ConfigurationType> 
     118    <PlatformToolset>v140</PlatformToolset> 
     119    <UseOfMfc>false</UseOfMfc> 
     120    <CharacterSet>MultiByte</CharacterSet> 
     121  </PropertyGroup> 
    76122  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="Configuration"> 
    77123    <ConfigurationType>StaticLibrary</ConfigurationType> 
     
    80126    <CharacterSet>MultiByte</CharacterSet> 
    81127  </PropertyGroup> 
     128  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="Configuration"> 
     129    <ConfigurationType>StaticLibrary</ConfigurationType> 
     130    <PlatformToolset>v140</PlatformToolset> 
     131    <UseOfMfc>false</UseOfMfc> 
     132    <CharacterSet>MultiByte</CharacterSet> 
     133  </PropertyGroup> 
    82134  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 
    83135    <ConfigurationType>StaticLibrary</ConfigurationType> 
     
    86138    <CharacterSet>MultiByte</CharacterSet> 
    87139  </PropertyGroup> 
     140  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> 
     141    <ConfigurationType>StaticLibrary</ConfigurationType> 
     142    <PlatformToolset>v140</PlatformToolset> 
     143    <UseOfMfc>false</UseOfMfc> 
     144    <CharacterSet>MultiByte</CharacterSet> 
     145  </PropertyGroup> 
    88146  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 
    89147    <ConfigurationType>StaticLibrary</ConfigurationType> 
     
    92150    <CharacterSet>MultiByte</CharacterSet> 
    93151  </PropertyGroup> 
     152  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> 
     153    <ConfigurationType>StaticLibrary</ConfigurationType> 
     154    <PlatformToolset>v140</PlatformToolset> 
     155    <UseOfMfc>false</UseOfMfc> 
     156    <CharacterSet>MultiByte</CharacterSet> 
     157  </PropertyGroup> 
    94158  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration"> 
    95159    <ConfigurationType>StaticLibrary</ConfigurationType> 
     
    128192    <CharacterSet>MultiByte</CharacterSet> 
    129193  </PropertyGroup> 
     194  <!-- Override the PlatformToolset --> 
     195  <PropertyGroup> 
     196    <PlatformToolset>$(BuildToolset)</PlatformToolset> 
     197    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet> 
     198  </PropertyGroup>   
    130199  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 
    131200  <ImportGroup Label="ExtensionSettings"> 
     
    136205    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
    137206  </ImportGroup> 
     207  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="PropertySheets"> 
     208    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     209    <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 
     210    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
     211  </ImportGroup> 
    138212  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets"> 
    139213    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     
    141215    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
    142216  </ImportGroup> 
     217  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="PropertySheets"> 
     218    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     219    <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 
     220    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
     221  </ImportGroup> 
    143222  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets"> 
    144223    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     
    146225    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    147226  </ImportGroup> 
     227  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="PropertySheets"> 
     228    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     229    <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 
     230    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     231  </ImportGroup> 
    148232  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets"> 
    149233    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     
    151235    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    152236  </ImportGroup> 
     237  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="PropertySheets"> 
     238    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     239    <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 
     240    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     241  </ImportGroup> 
    153242  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> 
    154243    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     
    156245    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    157246  </ImportGroup> 
     247  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> 
     248    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     249    <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 
     250    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     251  </ImportGroup> 
    158252  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> 
    159253    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    160254    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     255    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     256  </ImportGroup> 
     257  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> 
     258    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     259    <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 
    161260    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    162261  </ImportGroup> 
     
    196295    <TargetName>pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 
    197296  </PropertyGroup> 
     297  <!-- Compile and link option definition --> 
     298  <ItemDefinitionGroup> 
     299    <ClCompile> 
     300      <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> 
     301    </ClCompile> 
     302  </ItemDefinitionGroup> 
    198303  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 
    199304    <ClCompile> 
     
    201306      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    202307      <PrecompiledHeaderOutputFile /> 
     308    </ClCompile> 
     309    <Lib> 
     310      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     311    </Lib> 
     312  </ItemDefinitionGroup> 
     313  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> 
     314    <ClCompile> 
     315      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     316      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     317      <PrecompiledHeaderOutputFile> 
     318      </PrecompiledHeaderOutputFile> 
    203319    </ClCompile> 
    204320    <Lib> 
     
    230346    </Lib> 
    231347  </ItemDefinitionGroup> 
     348  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> 
     349    <ClCompile> 
     350      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     351      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     352      <PrecompiledHeaderOutputFile> 
     353      </PrecompiledHeaderOutputFile> 
     354    </ClCompile> 
     355    <Lib> 
     356      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     357    </Lib> 
     358  </ItemDefinitionGroup> 
    232359  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 
    233360    <Midl> 
     
    253380    </Lib> 
    254381  </ItemDefinitionGroup> 
     382  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> 
     383    <ClCompile> 
     384      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     385      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     386      <PrecompiledHeaderOutputFile> 
     387      </PrecompiledHeaderOutputFile> 
     388    </ClCompile> 
     389    <Lib> 
     390      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     391    </Lib> 
     392  </ItemDefinitionGroup> 
    255393  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'"> 
    256394    <Midl> 
     
    277415    </Lib> 
    278416  </ItemDefinitionGroup> 
     417  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> 
     418    <ClCompile> 
     419      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     420      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     421      <PrecompiledHeaderOutputFile> 
     422      </PrecompiledHeaderOutputFile> 
     423    </ClCompile> 
     424    <Lib> 
     425      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     426    </Lib> 
     427  </ItemDefinitionGroup> 
    279428  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'"> 
    280429    <Midl> 
     
    300449    </Lib> 
    301450  </ItemDefinitionGroup> 
     451  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> 
     452    <ClCompile> 
     453      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     454      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     455      <PrecompiledHeaderOutputFile> 
     456      </PrecompiledHeaderOutputFile> 
     457    </ClCompile> 
     458    <Lib> 
     459      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     460    </Lib> 
     461  </ItemDefinitionGroup> 
    302462  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'"> 
    303463    <Midl> 
     
    319479      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    320480      <PrecompiledHeaderOutputFile /> 
     481    </ClCompile> 
     482    <Lib> 
     483      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     484    </Lib> 
     485  </ItemDefinitionGroup> 
     486  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> 
     487    <ClCompile> 
     488      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     489      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     490      <PrecompiledHeaderOutputFile> 
     491      </PrecompiledHeaderOutputFile> 
    321492    </ClCompile> 
    322493    <Lib> 
Note: See TracChangeset for help on using the changeset viewer.