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/build/pjnath_test.vcxproj | |
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/build/pjnath_test.vcxproj')
-rw-r--r-- | pjnath/build/pjnath_test.vcxproj | 22 |
1 files changed, 21 insertions, 1 deletions
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> |