diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2017-01-23 04:32:34 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2017-01-23 04:32:34 +0000 |
commit | f6d78bf855f2d564f9e383508908631a4668e2af (patch) | |
tree | 223bd69531113c5069679f9a6d482c03863284c9 /pjnath | |
parent | dfe36134873cb77d5b9c2a999f3134eb79f6ca6e (diff) |
Re #1900: Reintegrated works in UWP branch to trunk.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5539 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjnath')
-rw-r--r-- | pjnath/build/pjnath.vcxproj | 235 | ||||
-rw-r--r-- | pjnath/build/pjnath_test.vcxproj | 22 |
2 files changed, 230 insertions, 27 deletions
diff --git a/pjnath/build/pjnath.vcxproj b/pjnath/build/pjnath.vcxproj index af968435..054522fb 100644 --- a/pjnath/build/pjnath.vcxproj +++ b/pjnath/build/pjnath.vcxproj @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug-Dynamic|ARM"> + <Configuration>Debug-Dynamic</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Debug-Dynamic|Win32"> <Configuration>Debug-Dynamic</Configuration> <Platform>Win32</Platform> @@ -9,6 +13,10 @@ <Configuration>Debug-Dynamic</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Debug-Static|ARM"> + <Configuration>Debug-Static</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Debug-Static|Win32"> <Configuration>Debug-Static</Configuration> <Platform>Win32</Platform> @@ -17,6 +25,10 @@ <Configuration>Debug-Static</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Debug|ARM"> + <Configuration>Debug</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> <Platform>Win32</Platform> @@ -25,6 +37,10 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Release-Dynamic|ARM"> + <Configuration>Release-Dynamic</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Release-Dynamic|Win32"> <Configuration>Release-Dynamic</Configuration> <Platform>Win32</Platform> @@ -33,6 +49,10 @@ <Configuration>Release-Dynamic</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Release-Static|ARM"> + <Configuration>Release-Static</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Release-Static|Win32"> <Configuration>Release-Static</Configuration> <Platform>Win32</Platform> @@ -41,6 +61,10 @@ <Configuration>Release-Static</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Release|ARM"> + <Configuration>Release</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -50,9 +74,13 @@ <Platform>x64</Platform> </ProjectConfiguration> </ItemGroup> + <!-- Import common config --> + <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" /> <PropertyGroup Label="Globals"> <ProjectGuid>{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}</ProjectGuid> - <RootNamespace>pjnath</RootNamespace> + <RootNamespace>pjnath</RootNamespace> + <!-- Specific UWP property --> + <DefaultLanguage>en-US</DefaultLanguage> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration"> @@ -61,36 +89,72 @@ <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <PlatformToolset>v140</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <PlatformToolset>v140</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <PlatformToolset>v140</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <PlatformToolset>v140</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <PlatformToolset>v140</PlatformToolset> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <PlatformToolset>v140</PlatformToolset> @@ -127,78 +191,124 @@ <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <!-- Override the PlatformToolset --> + <PropertyGroup> + <PlatformToolset>$(BuildToolset)</PlatformToolset> + <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet> + </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> - <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> - <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> - <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> - <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> - <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> - <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> - <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> - <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> - <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> - <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> - <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> - <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> + <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> </PropertyGroup> + <!-- Compile and link option definition --> + <ItemDefinitionGroup> + <ClCompile> + <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> + </ClCompile> + </ItemDefinitionGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'"> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules /> <CodeAnalysisRuleAssemblies /> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules /> + <CodeAnalysisRuleAssemblies /> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'"> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules /> @@ -214,11 +324,21 @@ <CodeAnalysisRules /> <CodeAnalysisRuleAssemblies /> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules /> + <CodeAnalysisRuleAssemblies /> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules /> <CodeAnalysisRuleAssemblies /> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules /> + <CodeAnalysisRuleAssemblies /> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules /> @@ -229,6 +349,11 @@ <CodeAnalysisRules /> <CodeAnalysisRuleAssemblies /> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules /> + <CodeAnalysisRuleAssemblies /> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules /> @@ -239,6 +364,11 @@ <CodeAnalysisRules /> <CodeAnalysisRuleAssemblies /> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules /> + <CodeAnalysisRuleAssemblies /> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'"> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules /> @@ -254,6 +384,11 @@ <CodeAnalysisRules /> <CodeAnalysisRuleAssemblies /> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules /> + <CodeAnalysisRuleAssemblies /> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -261,6 +396,14 @@ <PrecompiledHeaderOutputFile /> </ClCompile> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> + <ClCompile> + <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Midl> <TargetEnvironment>X64</TargetEnvironment> @@ -278,6 +421,14 @@ <PrecompiledHeaderOutputFile /> </ClCompile> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <ClCompile> + <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Midl> <TargetEnvironment>X64</TargetEnvironment> @@ -296,6 +447,14 @@ <PrecompiledHeaderOutputFile /> </ClCompile> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> + <ClCompile> + <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'"> <Midl> <TargetEnvironment>X64</TargetEnvironment> @@ -314,6 +473,14 @@ <PrecompiledHeaderOutputFile /> </ClCompile> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> + <ClCompile> + <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'"> <Midl> <TargetEnvironment>X64</TargetEnvironment> @@ -331,6 +498,14 @@ <PrecompiledHeaderOutputFile /> </ClCompile> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> + <ClCompile> + <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'"> <Midl> <TargetEnvironment>X64</TargetEnvironment> @@ -349,6 +524,14 @@ <PrecompiledHeaderOutputFile /> </ClCompile> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> + <ClCompile> + <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'"> <Midl> <TargetEnvironment>X64</TargetEnvironment> @@ -387,7 +570,7 @@ <ClInclude Include="..\include\pjnath\ice_strans.h" /> <ClInclude Include="..\include\pjnath\nat_detect.h" /> <ClInclude Include="..\include\pjnath\stun_auth.h" /> - <ClInclude Include="..\include\pjnath\stun_config.h" /> + <ClInclude Include="..\include\pjnath\stun_config.h" /> <ClInclude Include="..\include\pjnath\stun_msg.h" /> <ClInclude Include="..\include\pjnath\stun_session.h" /> <ClInclude Include="..\include\pjnath\stun_transaction.h" /> diff --git a/pjnath/build/pjnath_test.vcxproj b/pjnath/build/pjnath_test.vcxproj index d4b2c296..ac5dd0a5 100644 --- a/pjnath/build/pjnath_test.vcxproj +++ b/pjnath/build/pjnath_test.vcxproj @@ -50,9 +50,13 @@ <Platform>x64</Platform> </ProjectConfiguration> </ItemGroup> + <!-- Import common config --> + <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" /> <PropertyGroup Label="Globals"> <ProjectGuid>{553C094C-F581-4A80-9540-D5D7B398A2C6}</ProjectGuid> <RootNamespace>pjnath_test</RootNamespace> + <DefaultLanguage>en-US</DefaultLanguage> + <!-- Specific UWP property --> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration"> @@ -127,6 +131,13 @@ <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <!-- Override the PlatformToolset --> + <PropertyGroup> + <PlatformToolset>$(BuildToolset)</PlatformToolset> + <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet> + <ConfigurationType Condition="'$(API_Family)'=='WinDesktop'">Application</ConfigurationType> + <ConfigurationType Condition="'$(API_Family)'=='UWP' Or '$(API_Family)'=='WinPhone8'">StaticLibrary</ConfigurationType> + </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> @@ -193,8 +204,17 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup> <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> - <TargetName>pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> + <TargetName>pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> </PropertyGroup> + <!-- Compile and link option definition --> + <ItemDefinitionGroup> + <ClCompile> + <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> + </ClCompile> + <Lib> + <OutputFile>..\lib\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> + </Lib> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |