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 /pjsip-apps/build/pjsystest.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 'pjsip-apps/build/pjsystest.vcxproj')
| -rw-r--r-- | pjsip-apps/build/pjsystest.vcxproj | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/pjsip-apps/build/pjsystest.vcxproj b/pjsip-apps/build/pjsystest.vcxproj index 29bd2fe8..ae0dfc50 100644 --- a/pjsip-apps/build/pjsystest.vcxproj +++ b/pjsip-apps/build/pjsystest.vcxproj @@ -18,10 +18,14 @@ <Platform>x64</Platform> </ProjectConfiguration> </ItemGroup> + <!-- Import common config --> + <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" /> <PropertyGroup Label="Globals"> <ProjectGuid>{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}</ProjectGuid> <RootNamespace>pjsystest</RootNamespace> - <Keyword>Win32Proj</Keyword> + <Keyword>Win32Proj</Keyword> + <!-- Specific UWP property --> + <DefaultLanguage>en-US</DefaultLanguage> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> @@ -40,6 +44,13 @@ <ConfigurationType>Application</ConfigurationType> <PlatformToolset>v140</PlatformToolset> </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> @@ -67,6 +78,12 @@ <PropertyGroup> <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> </PropertyGroup> + <!-- Compile and link option definition --> + <ItemDefinitionGroup> + <ClCompile> + <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> + </ClCompile> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |