Ignore:
Timestamp:
Jan 23, 2017 4:32:34 AM (7 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/pjsip-apps/build/libpjproject.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>{23D7679C-764C-4E02-8B29-BB882CEEEFE2}</ProjectGuid> 
    5581    <RootNamespace>libpjproject</RootNamespace> 
     82    <!-- Specific UWP property --> 
     83    <DefaultLanguage>en-US</DefaultLanguage> 
    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> 
    … …  
    127191    <UseOfMfc>false</UseOfMfc> 
    128192    <CharacterSet>MultiByte</CharacterSet> 
     193  </PropertyGroup> 
     194  <!-- Override the PlatformToolset --> 
     195  <PropertyGroup> 
     196    <PlatformToolset>$(BuildToolset)</PlatformToolset> 
     197    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"> 
     198    </CharacterSet> 
    129199  </PropertyGroup> 
    130200  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 
    … …  
    136206    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
    137207  </ImportGroup> 
     208  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="PropertySheets"> 
     209    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     210    <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 
     211    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
     212  </ImportGroup> 
    138213  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets"> 
    139214    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    … …  
    141216    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
    142217  </ImportGroup> 
     218  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="PropertySheets"> 
     219    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     220    <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 
     221    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
     222  </ImportGroup> 
    143223  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets"> 
    144224    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    … …  
    146226    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    147227  </ImportGroup> 
     228  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="PropertySheets"> 
     229    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     230    <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 
     231    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     232  </ImportGroup> 
    148233  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets"> 
    149234    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    … …  
    151236    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    152237  </ImportGroup> 
     238  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="PropertySheets"> 
     239    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     240    <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 
     241    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     242  </ImportGroup> 
    153243  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> 
    154244    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    … …  
    156246    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    157247  </ImportGroup> 
     248  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> 
     249    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     250    <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 
     251    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     252  </ImportGroup> 
    158253  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> 
    159254    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    160255    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     256    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     257  </ImportGroup> 
     258  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> 
     259    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     260    <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 
    161261    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    162262  </ImportGroup> 
    … …  
    196296    <OutDir>..\..\lib\</OutDir> 
    197297  </PropertyGroup> 
     298  <!-- Compile and link option definition --> 
     299  <ItemDefinitionGroup> 
     300    <ClCompile> 
     301      <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> 
     302    </ClCompile> 
     303  </ItemDefinitionGroup> 
    198304  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 
    199305    <ClCompile> 
    … …  
    206312    <Lib> 
    207313      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     314    </Lib> 
     315  </ItemDefinitionGroup> 
     316  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> 
     317    <ClCompile> 
     318      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     319      <PrecompiledHeaderOutputFile> 
     320      </PrecompiledHeaderOutputFile> 
     321      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 
     322    </ClCompile> 
     323    <ProjectReference> 
     324      <LinkLibraryDependencies>true</LinkLibraryDependencies> 
     325    </ProjectReference> 
     326    <Lib> 
     327      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     328      <AdditionalOptions>/ignore:4264 </AdditionalOptions> 
    208329    </Lib> 
    209330  </ItemDefinitionGroup> 
    … …  
    236357    </Lib> 
    237358  </ItemDefinitionGroup> 
     359  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> 
     360    <ClCompile> 
     361      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     362      <PrecompiledHeaderOutputFile> 
     363      </PrecompiledHeaderOutputFile> 
     364    </ClCompile> 
     365    <ProjectReference> 
     366      <LinkLibraryDependencies>true</LinkLibraryDependencies> 
     367    </ProjectReference> 
     368    <Lib> 
     369      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     370      <AdditionalOptions>/ignore:4264 </AdditionalOptions> 
     371    </Lib> 
     372  </ItemDefinitionGroup> 
    238373  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 
    239374    <Midl> 
    … …  
    263398    </Lib> 
    264399  </ItemDefinitionGroup> 
     400  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> 
     401    <ClCompile> 
     402      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     403      <PrecompiledHeaderOutputFile> 
     404      </PrecompiledHeaderOutputFile> 
     405    </ClCompile> 
     406    <ProjectReference> 
     407      <LinkLibraryDependencies>true</LinkLibraryDependencies> 
     408    </ProjectReference> 
     409    <Lib> 
     410      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     411      <AdditionalOptions>/ignore:4264 </AdditionalOptions> 
     412    </Lib> 
     413  </ItemDefinitionGroup> 
    265414  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'"> 
    266415    <Midl> 
    … …  
    291440    </Lib> 
    292441  </ItemDefinitionGroup> 
     442  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> 
     443    <ClCompile> 
     444      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     445      <PrecompiledHeaderOutputFile> 
     446      </PrecompiledHeaderOutputFile> 
     447    </ClCompile> 
     448    <ProjectReference> 
     449      <LinkLibraryDependencies>true</LinkLibraryDependencies> 
     450    </ProjectReference> 
     451    <Lib> 
     452      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     453      <AdditionalOptions>/ignore:4264 </AdditionalOptions> 
     454    </Lib> 
     455  </ItemDefinitionGroup> 
    293456  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'"> 
    294457    <Midl> 
    … …  
    318481    </Lib> 
    319482  </ItemDefinitionGroup> 
     483  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> 
     484    <ClCompile> 
     485      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     486      <PrecompiledHeaderOutputFile> 
     487      </PrecompiledHeaderOutputFile> 
     488    </ClCompile> 
     489    <ProjectReference> 
     490      <LinkLibraryDependencies>true</LinkLibraryDependencies> 
     491    </ProjectReference> 
     492    <Lib> 
     493      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     494      <AdditionalOptions>/ignore:4264 </AdditionalOptions> 
     495    </Lib> 
     496  </ItemDefinitionGroup> 
    320497  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'"> 
    321498    <Midl> 
    … …  
    344521    <Lib> 
    345522      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     523    </Lib> 
     524  </ItemDefinitionGroup> 
     525  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> 
     526    <ClCompile> 
     527      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     528      <PrecompiledHeaderOutputFile> 
     529      </PrecompiledHeaderOutputFile> 
     530    </ClCompile> 
     531    <ProjectReference> 
     532      <LinkLibraryDependencies>true</LinkLibraryDependencies> 
     533    </ProjectReference> 
     534    <Lib> 
     535      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     536      <AdditionalOptions>/ignore:4264 </AdditionalOptions> 
    346537    </Lib> 
    347538  </ItemDefinitionGroup> 
Note: See TracChangeset for help on using the changeset viewer.