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 /third_party/build/webrtc | |
| 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 'third_party/build/webrtc')
| -rw-r--r-- | third_party/build/webrtc/libwebrtc.vcxproj | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/third_party/build/webrtc/libwebrtc.vcxproj b/third_party/build/webrtc/libwebrtc.vcxproj index 3e9e034e..011d3092 100644 --- a/third_party/build/webrtc/libwebrtc.vcxproj +++ b/third_party/build/webrtc/libwebrtc.vcxproj @@ -139,9 +139,13 @@ <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\utility\delay_estimator_wrapper.c" /> <ClCompile Include="..\..\webrtc\src\webrtc\system_wrappers\source\cpu_features.cc" /> </ItemGroup> + <!-- Import common config --> + <Import Project="..\..\..\build\vs\pjproject-vs14-common-config.props" /> <PropertyGroup Label="Globals"> <ProjectGuid>{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}</ProjectGuid> <RootNamespace>libwebrtc</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"> @@ -216,6 +220,11 @@ <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> @@ -284,6 +293,12 @@ <_ProjectFileVersion>14.0.24730.2</_ProjectFileVersion> <OutDir>..\..\lib\</OutDir> </PropertyGroup> + <!-- Compile and link option definition --> + <ItemDefinitionGroup> + <ClCompile> + <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> + </ClCompile> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> |