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:
3 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk

  • pjproject/trunk/pjnath/build/pjnath.vcxproj

    r5168 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>{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}</ProjectGuid> 
    55     <RootNamespace>pjnath</RootNamespace> 
     81    <RootNamespace>pjnath</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)'=='Debug|Win32'" Label="Configuration"> 
    83135    <ConfigurationType>StaticLibrary</ConfigurationType> 
    … …  
    86138    <CharacterSet>MultiByte</CharacterSet> 
    87139  </PropertyGroup> 
     140  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|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)'=='Release|Win32'" Label="Configuration"> 
    89147    <ConfigurationType>StaticLibrary</ConfigurationType> 
    … …  
    92150    <CharacterSet>MultiByte</CharacterSet> 
    93151  </PropertyGroup> 
     152  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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'"></CharacterSet> 
    129198  </PropertyGroup> 
    130199  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 
    … …  
    133202  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets"> 
    134203    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    135         <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
    136     <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />     
     204    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     205    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
     206  </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" /> 
    137211  </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" /> 
    140         <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
    141     <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />     
     214    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     215    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
     216  </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" /> 
    142221  </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" /> 
    145         <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
    146     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />     
     224    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     225    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     226  </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" /> 
    147231  </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" /> 
    150         <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
    151     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />     
     234    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     235    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     236  </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" /> 
    152241  </ImportGroup> 
    153242  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> 
    154243    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    155         <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
    156     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />     
     244    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     245    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     246  </ImportGroup> 
     247  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|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-common-defaults.props" /> 
     250    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    157251  </ImportGroup> 
    158252  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> 
    159253    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    160         <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
    161     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />     
     254    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     255    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     256  </ImportGroup> 
     257  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|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-release-defaults.props" /> 
     260    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    162261  </ImportGroup> 
    163262  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets"> 
    164263    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    165         <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
    166     <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />     
     264    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
     265    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
    167266  </ImportGroup> 
    168267  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets"> 
    169268    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    170         <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
    171     <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />     
     269    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     270    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
    172271  </ImportGroup> 
    173272  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets"> 
    174273    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    175         <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
    176     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />     
     274    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
     275    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    177276  </ImportGroup> 
    178277  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets"> 
    179278    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    180         <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
    181     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />     
     279    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     280    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    182281  </ImportGroup> 
    183282  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> 
    184283    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    185         <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
    186     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />     
     284    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     285    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    187286  </ImportGroup> 
    188287  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> 
    189288    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    190         <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
    191     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />     
     289    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
     290    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    192291  </ImportGroup> 
    193292  <PropertyGroup Label="UserMacros" /> 
    … …  
    195294    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> 
    196295  </PropertyGroup> 
     296  <!-- Compile and link option definition --> 
     297  <ItemDefinitionGroup> 
     298    <ClCompile> 
     299      <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> 
     300    </ClCompile> 
     301  </ItemDefinitionGroup> 
    197302  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'"> 
    198303    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> 
    … …  
    200305    <CodeAnalysisRuleAssemblies /> 
    201306  </PropertyGroup> 
     307  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> 
     308    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> 
     309    <CodeAnalysisRules /> 
     310    <CodeAnalysisRuleAssemblies /> 
     311  </PropertyGroup> 
    202312  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'"> 
    203313    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> 
    … …  
    215325    <CodeAnalysisRuleAssemblies /> 
    216326  </PropertyGroup> 
     327  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> 
     328    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> 
     329    <CodeAnalysisRules /> 
     330    <CodeAnalysisRuleAssemblies /> 
     331  </PropertyGroup> 
    217332  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 
    218333    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> 
    … …  
    220335    <CodeAnalysisRuleAssemblies /> 
    221336  </PropertyGroup> 
     337  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> 
     338    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> 
     339    <CodeAnalysisRules /> 
     340    <CodeAnalysisRuleAssemblies /> 
     341  </PropertyGroup> 
    222342  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 
    223343    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> 
    … …  
    230350    <CodeAnalysisRuleAssemblies /> 
    231351  </PropertyGroup> 
     352  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> 
     353    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> 
     354    <CodeAnalysisRules /> 
     355    <CodeAnalysisRuleAssemblies /> 
     356  </PropertyGroup> 
    232357  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 
    233358    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> 
    … …  
    240365    <CodeAnalysisRuleAssemblies /> 
    241366  </PropertyGroup> 
     367  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> 
     368    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> 
     369    <CodeAnalysisRules /> 
     370    <CodeAnalysisRuleAssemblies /> 
     371  </PropertyGroup> 
    242372  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'"> 
    243373    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> 
    … …  
    255385    <CodeAnalysisRuleAssemblies /> 
    256386  </PropertyGroup> 
     387  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> 
     388    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> 
     389    <CodeAnalysisRules /> 
     390    <CodeAnalysisRuleAssemblies /> 
     391  </PropertyGroup> 
    257392  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 
    258393    <ClCompile> 
    … …  
    260395      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    261396      <PrecompiledHeaderOutputFile /> 
     397    </ClCompile> 
     398  </ItemDefinitionGroup> 
     399  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> 
     400    <ClCompile> 
     401      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     402      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     403      <PrecompiledHeaderOutputFile> 
     404      </PrecompiledHeaderOutputFile> 
    262405    </ClCompile> 
    263406  </ItemDefinitionGroup> 
    … …  
    279422    </ClCompile> 
    280423  </ItemDefinitionGroup> 
     424  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> 
     425    <ClCompile> 
     426      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     427      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     428      <PrecompiledHeaderOutputFile> 
     429      </PrecompiledHeaderOutputFile> 
     430    </ClCompile> 
     431  </ItemDefinitionGroup> 
    281432  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 
    282433    <Midl> 
    … …  
    297448    </ClCompile> 
    298449  </ItemDefinitionGroup> 
     450  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> 
     451    <ClCompile> 
     452      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     453      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     454      <PrecompiledHeaderOutputFile> 
     455      </PrecompiledHeaderOutputFile> 
     456    </ClCompile> 
     457  </ItemDefinitionGroup> 
    299458  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'"> 
    300459    <Midl> 
    … …  
    315474    </ClCompile> 
    316475  </ItemDefinitionGroup> 
     476  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> 
     477    <ClCompile> 
     478      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     479      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     480      <PrecompiledHeaderOutputFile> 
     481      </PrecompiledHeaderOutputFile> 
     482    </ClCompile> 
     483  </ItemDefinitionGroup> 
    317484  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'"> 
    318485    <Midl> 
    … …  
    332499    </ClCompile> 
    333500  </ItemDefinitionGroup> 
     501  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> 
     502    <ClCompile> 
     503      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     504      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     505      <PrecompiledHeaderOutputFile> 
     506      </PrecompiledHeaderOutputFile> 
     507    </ClCompile> 
     508  </ItemDefinitionGroup> 
    334509  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'"> 
    335510    <Midl> 
    … …  
    348523      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    349524      <PrecompiledHeaderOutputFile /> 
     525    </ClCompile> 
     526  </ItemDefinitionGroup> 
     527  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> 
     528    <ClCompile> 
     529      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     530      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     531      <PrecompiledHeaderOutputFile> 
     532      </PrecompiledHeaderOutputFile> 
    350533    </ClCompile> 
    351534  </ItemDefinitionGroup> 
    … …  
    388571    <ClInclude Include="..\include\pjnath\nat_detect.h" /> 
    389572    <ClInclude Include="..\include\pjnath\stun_auth.h" /> 
    390     <ClInclude Include="..\include\pjnath\stun_config.h" />     
     573    <ClInclude Include="..\include\pjnath\stun_config.h" /> 
    391574    <ClInclude Include="..\include\pjnath\stun_msg.h" /> 
    392575    <ClInclude Include="..\include\pjnath\stun_session.h" /> 

  • pjproject/trunk/pjnath/build/pjnath_test.vcxproj

    r5168 r5539  
    5151    </ProjectConfiguration> 
    5252  </ItemGroup> 
     53  <!-- Import common config --> 
     54  <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" /> 
    5355  <PropertyGroup Label="Globals"> 
    5456    <ProjectGuid>{553C094C-F581-4A80-9540-D5D7B398A2C6}</ProjectGuid> 
    5557    <RootNamespace>pjnath_test</RootNamespace> 
     58    <DefaultLanguage>en-US</DefaultLanguage> 
     59    <!-- Specific UWP property --> 
    5660  </PropertyGroup> 
    5761  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 
    … …  
    128132    <CharacterSet>MultiByte</CharacterSet> 
    129133  </PropertyGroup> 
     134  <!-- Override the PlatformToolset --> 
     135  <PropertyGroup> 
     136    <PlatformToolset>$(BuildToolset)</PlatformToolset> 
     137    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet> 
     138    <ConfigurationType Condition="'$(API_Family)'=='WinDesktop'">Application</ConfigurationType> 
     139    <ConfigurationType Condition="'$(API_Family)'=='UWP' Or '$(API_Family)'=='WinPhone8'">StaticLibrary</ConfigurationType> 
     140  </PropertyGroup>   
    130141  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 
    131142  <ImportGroup Label="ExtensionSettings"> 
    … …  
    194205  <PropertyGroup> 
    195206    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> 
    196         <TargetName>pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 
    197   </PropertyGroup> 
     207          <TargetName>pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 
     208  </PropertyGroup> 
     209  <!-- Compile and link option definition --> 
     210  <ItemDefinitionGroup> 
     211    <ClCompile> 
     212      <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> 
     213    </ClCompile> 
     214    <Lib> 
     215      <OutputFile>..\lib\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     216    </Lib> 
     217  </ItemDefinitionGroup> 
    198218  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 
    199219    <ClCompile> 
Note: See TracChangeset for help on using the changeset viewer.