Ignore:
Timestamp:
Jan 23, 2017 4:32:34 AM (7 years ago)
Author:
nanang
Message:

Re #1900: Reintegrated works in UWP branch to trunk.

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk

  • pjproject/trunk/pjsip-apps/build/sample_debug.vcxproj

    r5168 r5539  
    5151    </ProjectConfiguration> 
    5252  </ItemGroup> 
     53  <!-- Import common config --> 
     54  <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" />   
    5355  <PropertyGroup Label="Globals"> 
    5456    <ProjectGuid>{A0F1AA62-0F6F-420D-B09A-AC04B6862821}</ProjectGuid> 
    55     <RootNamespace>sample_debug</RootNamespace> 
     57    <RootNamespace>sample_debug</RootNamespace>     
     58    <!-- Specific UWP property --> 
     59    <DefaultLanguage>en-US</DefaultLanguage> 
    5660  </PropertyGroup> 
    5761  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 
     
    127131    <UseOfMfc>false</UseOfMfc> 
    128132    <CharacterSet>MultiByte</CharacterSet> 
     133  </PropertyGroup> 
     134  <!-- Override the PlatformToolset -->   
     135  <PropertyGroup> 
     136    <PlatformToolset>$(BuildToolset)</PlatformToolset> 
     137    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet> 
     138    <ConfigurationType Condition="'$(API_Family)'=='WinDesktop'">Application</ConfigurationType> 
     139    <ConfigurationType Condition="'$(API_Family)'=='UWP' Or '$(API_Family)'=='WinPhone8'">StaticLibrary</ConfigurationType> 
    129140  </PropertyGroup> 
    130141  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 
     
    194205  <PropertyGroup> 
    195206    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> 
    196         <TargetName>sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 
    197   </PropertyGroup> 
     207          <TargetName>sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 
     208  </PropertyGroup> 
     209  <!-- Compile and link option definition --> 
     210  <ItemDefinitionGroup> 
     211    <ClCompile> 
     212      <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> 
     213    </ClCompile> 
     214    <Lib> 
     215      <OutputFile>..\lib\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     216    </Lib> 
     217  </ItemDefinitionGroup> 
    198218  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 
    199219    <ClCompile> 
Note: See TracChangeset for help on using the changeset viewer.