Changeset 5528


Ignore:
Timestamp:
Jan 18, 2017 7:01:37 AM (3 years ago)
Author:
riza
Message:

Re #1900: Misc updates, some projects are platform specific. Prevent it from being built for the unintended platform.

Location:
pjproject/branches/projects/uwp
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/projects/uwp/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_uwp_comp.vcxproj

    r5470 r5528  
    110110  <ImportGroup Label="ExtensionSettings"> 
    111111  </ImportGroup> 
    112   <ImportGroup Condition="'$(API_Family)'=='UWP'"> 
    113     <Import Project="pjsua_cli_shared_comp.vcxitems" Label="Shared" /> 
    114   </ImportGroup> 
     112  <Import Project="pjsua_cli_shared_comp.vcxitems" Label="Shared" />   
    115113  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 
    116114    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     
    271269      <OutputFile>..\lib\pjsua-cli-uwp-comp-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).dll</OutputFile> 
    272270    </Link> 
    273   </ItemDefinitionGroup> 
    274   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 
     271  </ItemDefinitionGroup>   
     272  <!--Don't build this project unless it's for UWP--> 
     273  <Import Condition="'$(API_Family)'=='UWP'" Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 
     274  <Import Condition="'$(API_Family)'!='UWP'" Project="..\..\..\..\..\..\..\build\vs\pjproject-vs14-build-targets.targets" />       
    275275  <ImportGroup Label="ExtensionTargets"> 
    276276  </ImportGroup> 
  • pjproject/branches/projects/uwp/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_wp8_comp.vcxproj

    r5210 r5528  
    5252  <Import Project="..\..\..\..\..\..\build\vs\pjproject-vs14-common-config.props" /> 
    5353  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 
    54   <ImportGroup Condition="'$(API_Family)'=='WinPhone8'"> 
     54  <ImportGroup> 
    5555    <Import Project="pjsua_cli_shared_comp.vcxitems" Label="Shared" /> 
    5656  </ImportGroup> 
     
    158158    </ProjectReference> 
    159159  </ItemGroup> 
    160   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 
    161   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" /> 
     160  <!--Don't build this project unless it's for WinPhone8--> 
     161  <Import Condition="'$(API_Family)'=='WinPhone8'" Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 
     162  <Import Condition="'$(API_Family)'=='WinPhone8'" Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" /> 
     163  <Import Condition="'$(API_Family)'!='WinPhone8'" Project="..\..\..\..\..\..\build\vs\pjproject-vs14-build-targets.targets" /> 
    162164  <ImportGroup Label="ExtensionTargets"> 
    163165  </ImportGroup> 
  • pjproject/branches/projects/uwp/pjsip-apps/src/pjsua/winrt/gui/uwp/Voip/Voip.csproj

    r5497 r5528  
    11<?xml version="1.0" encoding="utf-8"?> 
    2 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 
     2<Project ToolsVersion="14.0" DefaultTargets="CheckAPI" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 
    33  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> 
     4  <!--Check for API_Family--> 
     5  <PropertyGroup> 
     6      <PROJ_Target>UWP</PROJ_Target> 
     7  </PropertyGroup> 
    48  <Import Project="..\..\..\..\..\..\..\build\vs\pjproject-vs14-common-config.props" /> 
     9  <Import Project="..\..\..\..\..\..\..\build\vs\pjproject-vs14-common-targets.targets" /> 
    510  <PropertyGroup> 
    611    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 
  • pjproject/branches/projects/uwp/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipBackEnd/VoipBackEnd.vcxproj

    r5470 r5528  
    271271    <ClInclude Include="MyApp.h" /> 
    272272  </ItemGroup> 
    273   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 
     273  <!--Don't build this project unless it's for UWP--> 
     274  <Import Condition="'$(API_Family)'=='UWP'" Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 
     275  <Import Condition="'$(API_Family)'!='UWP'" Project="..\..\..\..\..\..\..\build\vs\pjproject-vs14-build-targets.targets" /> 
    274276  <ImportGroup Label="ExtensionTargets"> 
    275277  </ImportGroup> 
  • pjproject/branches/projects/uwp/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipHost/VoipHost.vcxproj

    r5254 r5528  
    240240    </Link> 
    241241  </ItemDefinitionGroup> 
    242   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 
     242  <!--Don't build this project unless it's for UWP--> 
     243  <Import Condition="'$(API_Family)'=='UWP'" Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 
     244  <Import Condition="'$(API_Family)'!='UWP'" Project="..\..\..\..\..\..\..\build\vs\pjproject-vs14-build-targets.targets" /> 
    243245  <ImportGroup Label="ExtensionTargets"> 
    244246  </ImportGroup> 
  • pjproject/branches/projects/uwp/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipTasks/VoipTasks.csproj

    r5497 r5528  
    11<?xml version="1.0" encoding="utf-8"?> 
    2 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 
    3   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> 
     2<Project ToolsVersion="14.0" DefaultTargets="CheckAPI" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 
     3  <!--Check for API_Family--> 
     4  <PropertyGroup> 
     5      <PROJ_Target>UWP</PROJ_Target> 
     6  </PropertyGroup>     
     7  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />     
    48  <Import Project="..\..\..\..\..\..\..\build\vs\pjproject-vs14-common-config.props" /> 
     9  <Import Project="..\..\..\..\..\..\..\build\vs\pjproject-vs14-common-targets.targets" /> 
    510  <PropertyGroup> 
    611    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 
Note: See TracChangeset for help on using the changeset viewer.