Ignore:
Timestamp:
Dec 28, 2016 5:20:16 AM (7 years ago)
Author:
riza
Message:

Re #1900: Fix merge conflict for solution file and project files. And fix some compile error found for UWP.

Location:
pjproject/branches/projects/uwp
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • pjproject/branches/projects/uwp

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • pjproject/branches/projects/uwp/pjsip-apps/build/libpjproject.vcxproj

    r5497 r5514  
    624624      <ReferenceOutputAssembly>false</ReferenceOutputAssembly> 
    625625    </ProjectReference> 
    626     <ProjectReference Condition="'$(API_Family)'=='WinDesktop'" Include="..\..\third_party\build\portaudio\libportaudio.vcxproj"> 
    627       <Project>{3cf9ffa9-8387-4635-9d1b-e7944cbefeaa}</Project> 
    628       <ReferenceOutputAssembly>false</ReferenceOutputAssembly> 
    629     </ProjectReference> 
    630626    <ProjectReference Include="..\..\third_party\build\resample\libresample.vcxproj"> 
    631627      <Project>{6794b975-4e84-4f49-b2dc-c31f2224e03e}</Project> 
    … …  
    639635      <Project>{f0dbaa03-1ba3-4e3b-a2ca-727e3d3ab858}</Project> 
    640636      <ReferenceOutputAssembly>false</ReferenceOutputAssembly> 
     637    </ProjectReference> 
     638    <ProjectReference Include="..\..\third_party\build\webrtc\libwebrtc.vcxproj"> 
     639      <Project>{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}</Project> 
     640    </ProjectReference> 
     641    <ProjectReference Include="..\..\third_party\build\yuv\libyuv.vcxproj"> 
     642      <Project>{6ac9b65f-0862-4a5c-8a9d-141516993130}</Project> 
    641643    </ProjectReference> 
    642644  </ItemGroup> 
Note: See TracChangeset for help on using the changeset viewer.