| OLD | NEW |
| 1 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbui
ld/2003"> | 1 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbui
ld/2003"> |
| 2 <Import Project="$(VCTargetsPath)\NaCl\ImportBefore\*.targets" Condition="Exis
ts('$(VCTargetsPath)\NaCl\ImportBefore')" /> | 2 <Import Project="$(VCTargetsPath)\NaCl\ImportBefore\*.targets" Condition="Exis
ts('$(VCTargetsPath)\NaCl\ImportBefore')" /> |
| 3 <Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" /> | 3 <Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" /> |
| 4 | 4 |
| 5 <!-- VS2012 (v110) required Platform.targets to be imported --> | 5 <!-- VS2012 (v110) required Platform.targets to be imported --> |
| 6 <Import Condition="Exists('$(VCTargetsPath)\Microsoft.Cpp.Platform.targets')"
Project="$(VCTargetsPath)\Microsoft.Cpp.Platform.targets"/> | 6 <Import Condition="Exists('$(VCTargetsPath)\Microsoft.Cpp.Platform.targets')"
Project="$(VCTargetsPath)\Microsoft.Cpp.Platform.targets"/> |
| 7 | 7 |
| 8 <UsingTask TaskName="NaClCompile" AssemblyFile="$(VCTargetsPath)\NaCl\NaCl.Bui
ld.CPPTasks.dll" /> | 8 <UsingTask TaskName="NaClCompile" AssemblyFile="$(VCTargetsPath)\NaCl\NaCl.Bui
ld.CPPTasks.dll" /> |
| 9 <UsingTask TaskName="NaClLink" AssemblyFile="$(VCTargetsPath)\NaCl\NaCl.Build.
CPPTasks.dll" /> | 9 <UsingTask TaskName="NaClLink" AssemblyFile="$(VCTargetsPath)\NaCl\NaCl.Build.
CPPTasks.dll" /> |
| 10 <UsingTask TaskName="NaClLib" AssemblyFile="$(VCTargetsPath)\NaCl\NaCl.Build.C
PPTasks.dll" /> | 10 <UsingTask TaskName="NaClLib" AssemblyFile="$(VCTargetsPath)\NaCl\NaCl.Build.C
PPTasks.dll" /> |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 Condition="'@(ClCompile)' != ''" | 24 Condition="'@(ClCompile)' != ''" |
| 25 DependsOnTargets="SelectClCompile"> | 25 DependsOnTargets="SelectClCompile"> |
| 26 | 26 |
| 27 <NaClCompile Condition="'%(ClCompile.ExcludedFromBuild)'!='true'" | 27 <NaClCompile Condition="'%(ClCompile.ExcludedFromBuild)'!='true'" |
| 28 BuildingInIDE ="$(BuildingInsideVisualStud
io)" | 28 BuildingInIDE ="$(BuildingInsideVisualStud
io)" |
| 29 Sources ="@(ClCompile)" | 29 Sources ="@(ClCompile)" |
| 30 OutputCommandLine ="%(ClCompile.OutputCommandL
ine)" | 30 OutputCommandLine ="%(ClCompile.OutputCommandL
ine)" |
| 31 ProcessorNumber ="%(ClCompile.ProcessorNumbe
r)" | 31 ProcessorNumber ="%(ClCompile.ProcessorNumbe
r)" |
| 32 MultiProcessorCompilation ="%(ClCompile.MultiProcessor
Compilation)" | 32 MultiProcessorCompilation ="%(ClCompile.MultiProcessor
Compilation)" |
| 33 MinimalRebuildFromTracking ="%(ClCompile.MinimalRebuild
FromTracking)" | 33 MinimalRebuildFromTracking ="%(ClCompile.MinimalRebuild
FromTracking)" |
| 34 NaCLCompilerPath ="$(VSNaClSDKRoot)toolchain\
win_x86_pnacl\newlib\bin\pnacl-clang.bat" | 34 NaCLCompilerPath ="$(VSNaClSDKRoot)toolchain\
win_pnacl\bin\pnacl-clang.bat" |
| 35 PropertiesFile ="$(VCTargetsPath)\NaCl\Prop
s\nacl_compile.xml" | 35 PropertiesFile ="$(VCTargetsPath)\NaCl\Prop
s\nacl_compile.xml" |
| 36 TLogReadFiles ="@(CLTLogReadFiles)" | 36 TLogReadFiles ="@(CLTLogReadFiles)" |
| 37 TLogWriteFiles ="@(CLTLogWriteFiles)" | 37 TLogWriteFiles ="@(CLTLogWriteFiles)" |
| 38 Platform ="$(Platform)" | 38 Platform ="$(Platform)" |
| 39 TrackFileAccess ="$(TrackFileAccess)" | 39 TrackFileAccess ="$(TrackFileAccess)" |
| 40 TrackerLogDirectory ="%(ClCompile.TrackerLogDire
ctory)" | 40 TrackerLogDirectory ="%(ClCompile.TrackerLogDire
ctory)" |
| 41 ConfigurationType ="$(ConfigurationType)"> | 41 ConfigurationType ="$(ConfigurationType)"> |
| 42 </NaClCompile> | 42 </NaClCompile> |
| 43 </Target> | 43 </Target> |
| 44 | 44 |
| 45 <!-- *************************************************************************
****************** | 45 <!-- *************************************************************************
****************** |
| 46 Link | 46 Link |
| 47 *************************************************************************
****************** --> | 47 *************************************************************************
****************** --> |
| 48 | 48 |
| 49 <Target Name="Link" | 49 <Target Name="Link" |
| 50 Condition="'@(Link)' != ''"> | 50 Condition="'@(Link)' != ''"> |
| 51 | 51 |
| 52 <PropertyGroup> | 52 <PropertyGroup> |
| 53 <Link_MinimalRebuildFromTracking Condition="'@(Link->AnyHaveMetadataValue(
'MinimalRebuildFromTracking', 'false'))' == 'true'">false</Link_MinimalRebuildFr
omTracking> | 53 <Link_MinimalRebuildFromTracking Condition="'@(Link->AnyHaveMetadataValue(
'MinimalRebuildFromTracking', 'false'))' == 'true'">false</Link_MinimalRebuildFr
omTracking> |
| 54 <Link_MinimalRebuildFromTracking Condition="'$(BuildType)' != 'Build' or '
$(ForceRebuild)' == 'true'" >false</Link_MinimalRebuildFromTracking> | 54 <Link_MinimalRebuildFromTracking Condition="'$(BuildType)' != 'Build' or '
$(ForceRebuild)' == 'true'" >false</Link_MinimalRebuildFromTracking> |
| 55 <Link_MinimalRebuildFromTracking Condition="'$(Link_MinimalRebuildFromTrac
king)' == ''">true</Link_MinimalRebuildFromTracking> | 55 <Link_MinimalRebuildFromTracking Condition="'$(Link_MinimalRebuildFromTrac
king)' == ''">true</Link_MinimalRebuildFromTracking> |
| 56 </PropertyGroup> | 56 </PropertyGroup> |
| 57 | 57 |
| 58 <NaClLink BuildingInIDE ="$(BuildingInsideVisualStudio)" | 58 <NaClLink BuildingInIDE ="$(BuildingInsideVisualStudio)" |
| 59 Sources ="@(Link)" | 59 Sources ="@(Link)" |
| 60 OutputCommandLine ="%(Link.OutputCommandLine)" | 60 OutputCommandLine ="%(Link.OutputCommandLine)" |
| 61 NaClLinkerPath ="$(VSNaClSDKRoot)toolchain\win_x86
_pnacl\newlib\bin\pnacl-clang++.bat" | 61 NaClLinkerPath ="$(VSNaClSDKRoot)toolchain\win_pna
cl\bin\pnacl-clang++.bat" |
| 62 CreateNMFPath ="$(VSNaClSDKRoot)tools\create_nmf.
py" | 62 CreateNMFPath ="$(VSNaClSDKRoot)tools\create_nmf.
py" |
| 63 MinimalRebuildFromTracking ="$(Link_MinimalRebuildFromTracking
)" | 63 MinimalRebuildFromTracking ="$(Link_MinimalRebuildFromTracking
)" |
| 64 OutputFile ="%(Link.OutputFile)" | 64 OutputFile ="%(Link.OutputFile)" |
| 65 PropertiesFile ="$(VCTargetsPath)\NaCl\Props\pnacl
_link.xml" | 65 PropertiesFile ="$(VCTargetsPath)\NaCl\Props\pnacl
_link.xml" |
| 66 TLogReadFiles ="@(LinkTLogReadFiles)" | 66 TLogReadFiles ="@(LinkTLogReadFiles)" |
| 67 TLogWriteFiles ="@(LinkTLogWriteFiles)" | 67 TLogWriteFiles ="@(LinkTLogWriteFiles)" |
| 68 ToolchainName ="$(ToolchainName)" | 68 ToolchainName ="$(ToolchainName)" |
| 69 CreateNMF ="%(Link.CreateNMF)" | 69 CreateNMF ="%(Link.CreateNMF)" |
| 70 ProjectName ="$(ProjectName)" | 70 ProjectName ="$(ProjectName)" |
| 71 Platform ="$(Platform)" | 71 Platform ="$(Platform)" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 94 | 94 |
| 95 <ItemGroup> | 95 <ItemGroup> |
| 96 <Lib> | 96 <Lib> |
| 97 <MinimalRebuildFromTracking Condition="'%(Lib.MinimalRebuildFromTracking
)' == '' and '$(BuildType)' == 'Build' and '$(ForceRebuild)' != 'true'">true</Mi
nimalRebuildFromTracking> | 97 <MinimalRebuildFromTracking Condition="'%(Lib.MinimalRebuildFromTracking
)' == '' and '$(BuildType)' == 'Build' and '$(ForceRebuild)' != 'true'">true</Mi
nimalRebuildFromTracking> |
| 98 </Lib> | 98 </Lib> |
| 99 </ItemGroup> | 99 </ItemGroup> |
| 100 | 100 |
| 101 <NaClLib BuildingInIDE ="$(BuildingInsideVisualStudio)" | 101 <NaClLib BuildingInIDE ="$(BuildingInsideVisualStudio)" |
| 102 Sources ="@(Lib)" | 102 Sources ="@(Lib)" |
| 103 OutputCommandLine ="%(Lib.OutputCommandLine)" | 103 OutputCommandLine ="%(Lib.OutputCommandLine)" |
| 104 LibrarianToolPath ="$(VSNaClSDKRoot)toolchain\win_x86_
pnacl\newlib\bin\pnacl-ar.bat" | 104 LibrarianToolPath ="$(VSNaClSDKRoot)toolchain\win_pnac
l\bin\pnacl-ar.bat" |
| 105 MinimalRebuildFromTracking ="%(Lib.MinimalRebuildFromTracking)" | 105 MinimalRebuildFromTracking ="%(Lib.MinimalRebuildFromTracking)" |
| 106 OutputFile ="%(Lib.OutputFile)" | 106 OutputFile ="%(Lib.OutputFile)" |
| 107 PropertiesFile ="$(VCTargetsPath)\NaCl\Props\nacl_l
ib.xml" | 107 PropertiesFile ="$(VCTargetsPath)\NaCl\Props\nacl_l
ib.xml" |
| 108 TrackerLogDirectory ="%(Lib.TrackerLogDirectory)" | 108 TrackerLogDirectory ="%(Lib.TrackerLogDirectory)" |
| 109 TLogReadFiles ="@(LIBTLogReadFiles)" | 109 TLogReadFiles ="@(LIBTLogReadFiles)" |
| 110 TLogWriteFiles ="@(LIBTLogWriteFiles)" | 110 TLogWriteFiles ="@(LIBTLogWriteFiles)" |
| 111 Platform ="$(Platform)" | 111 Platform ="$(Platform)" |
| 112 TrackFileAccess ="$(TrackFileAccess)"> | 112 TrackFileAccess ="$(TrackFileAccess)"> |
| 113 <Output TaskParameter="SkippedExecution" PropertyName="LibSkippedExecuti
on" /> | 113 <Output TaskParameter="SkippedExecution" PropertyName="LibSkippedExecuti
on" /> |
| 114 </NaClLib> | 114 </NaClLib> |
| 115 | 115 |
| 116 <Message Condition="'$(LibSkippedExecution)' == 'false'" Text="$(MSBuildProj
ectFile) -> $(TargetPath)" Importance="High" /> | 116 <Message Condition="'$(LibSkippedExecution)' == 'false'" Text="$(MSBuildProj
ectFile) -> $(TargetPath)" Importance="High" /> |
| 117 | 117 |
| 118 </Target> | 118 </Target> |
| 119 | 119 |
| 120 <!-- Imports --> | 120 <!-- Imports --> |
| 121 <Import Project="$(VCTargetsPath)\NaCl\NaCl.CppBuild.targets" /> | 121 <Import Project="$(VCTargetsPath)\NaCl\NaCl.CppBuild.targets" /> |
| 122 <Import Project="$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microso
ft.Cpp.NaCl.win_x86_newlib.targets" Condition="'pnacl' == 'newlib' AND (exists('
$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.NaCl.win_x86
_newlib.targets'))" /> | 122 <Import Project="$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microso
ft.Cpp.NaCl.win_x86_newlib.targets" Condition="'pnacl' == 'newlib' AND (exists('
$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.NaCl.win_x86
_newlib.targets'))" /> |
| 123 <Import Project="$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_glibc\Microsof
t.Cpp.NaCl.win_x86_glibc.targets" Condition="'$(ToolchainName)' == 'glibc' AND (
exists('$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_glibc\Microsoft.Cpp.NaCl.
win_x86_glibc.targets'))" /> | 123 <Import Project="$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_glibc\Microsof
t.Cpp.NaCl.win_x86_glibc.targets" Condition="'$(ToolchainName)' == 'glibc' AND (
exists('$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_glibc\Microsoft.Cpp.NaCl.
win_x86_glibc.targets'))" /> |
| 124 | 124 |
| 125 </Project> | 125 </Project> |
| OLD | NEW |