Changeset 5528 for pjproject/branches/projects/uwp/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_uwp_comp.vcxproj

Timestamp:

Jan 18, 2017 7:01:37 AM (8 years ago)

Author:

riza

Message:

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

File:

• pjproject/branches/projects/uwp/pjsip-apps/src/pjsua/winrt/cli/comp/pjsua_cli_uwp_comp.vcxproj (modified) (2 diffs)

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

@@ -110 +110 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(API_Family)'=='UWP'">
-    <Import Project="pjsua_cli_shared_comp.vcxitems" Label="Shared" />
-  </ImportGroup>
+  <Import Project="pjsua_cli_shared_comp.vcxitems" Label="Shared" />  
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -271 +269 @@
       <OutputFile>..\lib\pjsua-cli-uwp-comp-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).dll</OutputFile>
     </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  </ItemDefinitionGroup>  
+  <!--Don't build this project unless it's for UWP-->
+  <Import Condition="'$(API_Family)'=='UWP'" Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Condition="'$(API_Family)'!='UWP'" Project="..\..\..\..\..\..\..\build\vs\pjproject-vs14-build-targets.targets" />      
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>