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/build/vs/pjproject-vs14-common-defaults.props

    r5210 r5514  
    2121      <CompileAsWinRT>false</CompileAsWinRT> 
    2222      <PrecompiledHeader>NotUsing</PrecompiledHeader> 
     23      <SDLCheck>false</SDLCheck> 
    2324    </ClCompile> 
    2425    <Lib> 
    2526      <OutputFile>..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
    26       <AdditionalOptions>/Ignore:4264 %(AdditionalOptions)</AdditionalOptions>       
     27      <AdditionalOptions>/Ignore:4264 %(AdditionalOptions)</AdditionalOptions> 
    2728    </Lib> 
    2829    <Link> 
Note: See TracChangeset for help on using the changeset viewer.