| 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)\Platforms\NaCl\ImportBefore\*.targets" Condi
tion="Exists('$(VCTargetsPath)\Platforms\NaCl\ImportBefore')" /> | 2 <Import Project="$(VCTargetsPath)\Platforms\NaCl\ImportBefore\*.targets" Condi
tion="Exists('$(VCTargetsPath)\Platforms\NaCl\ImportBefore')" /> |
| 3 <Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" /> | 3 <Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" /> |
| 4 | 4 |
| 5 <UsingTask TaskName="NaClCompile" AssemblyFile="$(VCTargetsPath)\Platforms\NaC
l\NaCl.Build.CPPTasks.dll" /> | 5 <UsingTask TaskName="NaClCompile" AssemblyFile="$(VCTargetsPath)\Platforms\NaC
l\NaCl.Build.CPPTasks.dll" /> |
| 6 <UsingTask TaskName="NaClLink" AssemblyFile="$(VCTargetsPath)\Platforms\NaCl\N
aCl.Build.CPPTasks.dll" /> | 6 <UsingTask TaskName="NaClLink" AssemblyFile="$(VCTargetsPath)\Platforms\NaCl\N
aCl.Build.CPPTasks.dll" /> |
| 7 <UsingTask TaskName="NaClLib" AssemblyFile="$(VCTargetsPath)\Platforms\NaCl\Na
Cl.Build.CPPTasks.dll" /> | 7 <UsingTask TaskName="NaClLib" AssemblyFile="$(VCTargetsPath)\Platforms\NaCl\Na
Cl.Build.CPPTasks.dll" /> |
| 8 <UsingTask TaskName="VCMessage" AssemblyName="Microsoft.Build.CppTasks.Common,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> | 8 <UsingTask TaskName="VCMessage" AssemblyName="Microsoft.Build.CppTasks.Common,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> |
| 9 | 9 |
| 10 | 10 |
| 11 <PropertyGroup> | 11 <PropertyGroup> |
| 12 <!-- Enable incremental build by enable file tracking in tasks--> | 12 <!-- Enable incremental build by enable file tracking in tasks--> |
| 13 <TrackFileAccess Condition="'$(TrackFileAccess)' == ''">true</TrackFileAcces
s> | 13 <TrackFileAccess Condition="'$(TrackFileAccess)' == ''">true</TrackFileAcces
s> |
| 14 </PropertyGroup> | 14 </PropertyGroup> |
| 15 | 15 |
| 16 <!-- *************************************************************************
****************** | 16 <!-- *************************************************************************
****************** |
| 17 CLCompile | 17 CLCompile |
| 18 *************************************************************************
****************** --> | 18 *************************************************************************
****************** --> |
| 19 | 19 |
| 20 <Target Name="ClCompile" | 20 <Target Name="ClCompile" |
| 21 Condition="'@(ClCompile)' != ''" | 21 Condition="'@(ClCompile)' != ''" |
| 22 DependsOnTargets="SelectClCompile"> | 22 DependsOnTargets="SelectClCompile"> |
| 23 | 23 |
| 24 <NaClCompile Condition="'%(ClCompile.ExcludedFromBuild)'!='true'" | 24 <NaClCompile Condition="'%(ClCompile.ExcludedFromBuild)'!='true'" |
| 25 BuildingInIDE ="$(BuildingInsideVisualStud
io)" | 25 BuildingInIDE ="$(BuildingInsideVisualStud
io)" |
| 26 Sources ="@(ClCompile)" | 26 Sources ="@(ClCompile)" |
| 27 OutputCommandLine ="%(ClCompile.OutputCommandL
ine)" | 27 OutputCommandLine ="%(ClCompile.OutputCommandL
ine)" |
| 28 MinimalRebuildFromTracking ="%(ClCompile.MinimalRebuild
FromTracking)" | 28 MinimalRebuildFromTracking ="%(ClCompile.MinimalRebuild
FromTracking)" |
| 29 NaCLCompilerPath ="$(VSNaClSDKRoot)\toolchain
\win_x86_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-g++.exe" | 29 NaCLCompilerPath ="$(VSNaClSDKRoot)\toolchain
\win_x86_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-g++.exe" |
| 30 PropertiesFile ="$(VCTargetsPath)\Platfor
ms\NaCl\Properties\nacl_compile.xml" | 30 PropertiesFile ="$(VCTargetsPath)\Platfor
ms\NaCl\Props\nacl_compile.xml" |
| 31 TLogReadFiles ="@(CLTLogReadFiles)" | 31 TLogReadFiles ="@(CLTLogReadFiles)" |
| 32 TLogWriteFiles ="@(CLTLogWriteFiles)" | 32 TLogWriteFiles ="@(CLTLogWriteFiles)" |
| 33 ToolExe ="$(CLToolExe)" | 33 ToolExe ="$(CLToolExe)" |
| 34 ToolPath ="$(CLToolPath)" | 34 ToolPath ="$(CLToolPath)" |
| 35 TrackFileAccess ="$(TrackFileAccess)" | 35 TrackFileAccess ="$(TrackFileAccess)" |
| 36 TrackerLogDirectory ="%(ClCompile.TrackerLogDire
ctory)"> | 36 TrackerLogDirectory ="%(ClCompile.TrackerLogDire
ctory)"> |
| 37 </NaClCompile> | 37 </NaClCompile> |
| 38 </Target> | 38 </Target> |
| 39 | 39 |
| 40 <!-- *************************************************************************
****************** | 40 <!-- *************************************************************************
****************** |
| 41 Link | 41 Link |
| 42 *************************************************************************
****************** --> | 42 *************************************************************************
****************** --> |
| 43 | 43 |
| 44 <Target Name="Link" | 44 <Target Name="Link" |
| 45 Condition="'@(Link)' != ''"> | 45 Condition="'@(Link)' != ''"> |
| 46 | 46 |
| 47 <PropertyGroup> | 47 <PropertyGroup> |
| 48 <Link_MinimalRebuildFromTracking Condition="'@(Link->AnyHaveMetadataValue(
'MinimalRebuildFromTracking', 'false'))' == 'true'">false</Link_MinimalRebuildFr
omTracking> | 48 <Link_MinimalRebuildFromTracking Condition="'@(Link->AnyHaveMetadataValue(
'MinimalRebuildFromTracking', 'false'))' == 'true'">false</Link_MinimalRebuildFr
omTracking> |
| 49 <Link_MinimalRebuildFromTracking Condition="'$(BuildType)' != 'Build' or '
$(ForceRebuild)' == 'true'" >false</Link_MinimalRebuildFromTracking> | 49 <Link_MinimalRebuildFromTracking Condition="'$(BuildType)' != 'Build' or '
$(ForceRebuild)' == 'true'" >false</Link_MinimalRebuildFromTracking> |
| 50 <Link_MinimalRebuildFromTracking Condition="'$(Link_MinimalRebuildFromTrac
king)' == ''">true</Link_MinimalRebuildFromTracking> | 50 <Link_MinimalRebuildFromTracking Condition="'$(Link_MinimalRebuildFromTrac
king)' == ''">true</Link_MinimalRebuildFromTracking> |
| 51 </PropertyGroup> | 51 </PropertyGroup> |
| 52 | 52 |
| 53 <NaClLink BuildingInIDE ="$(BuildingInsideVisualStudio)" | 53 <NaClLink BuildingInIDE ="$(BuildingInsideVisualStudio)" |
| 54 Sources ="@(Link)" | 54 Sources ="@(Link)" |
| 55 | 55 |
| 56 OutputCommandLine ="%(Link.OutputCommandLine)" | 56 OutputCommandLine ="%(Link.OutputCommandLine)" |
| 57 NaClLinkerPath ="$(VSNaClSDKRoot)\toolchain\win_x8
6_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-g++.exe" | 57 NaClLinkerPath ="$(VSNaClSDKRoot)\toolchain\win_x8
6_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-g++.exe" |
| 58 MinimalRebuildFromTracking ="$(Link_MinimalRebuildFromTracking
)" | 58 MinimalRebuildFromTracking ="$(Link_MinimalRebuildFromTracking
)" |
| 59 OutputFile ="%(Link.OutputFile)" | 59 OutputFile ="%(Link.OutputFile)" |
| 60 PropertiesFile ="$(VCTargetsPath)\Platforms\NaCl
\Properties\nacl_link.xml" | 60 PropertiesFile ="$(VCTargetsPath)\Platforms\NaCl
\Props\nacl_link.xml" |
| 61 TLogReadFiles ="@(LinkTLogReadFiles)" | 61 TLogReadFiles ="@(LinkTLogReadFiles)" |
| 62 TLogWriteFiles ="@(LinkTLogWriteFiles)" | 62 TLogWriteFiles ="@(LinkTLogWriteFiles)" |
| 63 ToolExe ="$(LinkToolExe)" | 63 ToolExe ="$(LinkToolExe)" |
| 64 ToolPath ="$(LinkToolPath)" | 64 ToolPath ="$(LinkToolPath)" |
| 65 TrackerLogDirectory ="%(Link.TrackerLogDirectory)" | 65 TrackerLogDirectory ="%(Link.TrackerLogDirectory)" |
| 66 TrackFileAccess ="$(TrackFileAccess)" | 66 TrackFileAccess ="$(TrackFileAccess)" |
| 67 ConfigurationType ="$(ConfigurationType)"> | 67 ConfigurationType ="$(ConfigurationType)"> |
| 68 <Output TaskParameter="SkippedExecution" PropertyName="LinkSkippedExecutio
n" /> | 68 <Output TaskParameter="SkippedExecution" PropertyName="LinkSkippedExecutio
n" /> |
| 69 </NaClLink> | 69 </NaClLink> |
| 70 | 70 |
| (...skipping 16 matching lines...) Expand all Loading... |
| 87 <MinimalRebuildFromTracking Condition="'%(Lib.MinimalRebuildFromTracking
)' == '' and '$(BuildType)' == 'Build' and '$(ForceRebuild)' != 'true'">true</Mi
nimalRebuildFromTracking> | 87 <MinimalRebuildFromTracking Condition="'%(Lib.MinimalRebuildFromTracking
)' == '' and '$(BuildType)' == 'Build' and '$(ForceRebuild)' != 'true'">true</Mi
nimalRebuildFromTracking> |
| 88 </Lib> | 88 </Lib> |
| 89 </ItemGroup> | 89 </ItemGroup> |
| 90 | 90 |
| 91 <NaClLib BuildingInIDE ="$(BuildingInsideVisualStudio)" | 91 <NaClLib BuildingInIDE ="$(BuildingInsideVisualStudio)" |
| 92 Sources ="@(Lib)" | 92 Sources ="@(Lib)" |
| 93 OutputCommandLine ="%(Lib.OutputCommandLine)" | 93 OutputCommandLine ="%(Lib.OutputCommandLine)" |
| 94 LibrarianToolPath ="$(VSNaClSDKRoot)\toolchain\win_x86
_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-ar.exe" | 94 LibrarianToolPath ="$(VSNaClSDKRoot)\toolchain\win_x86
_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-ar.exe" |
| 95 MinimalRebuildFromTracking ="%(Lib.MinimalRebuildFromTracking)" | 95 MinimalRebuildFromTracking ="%(Lib.MinimalRebuildFromTracking)" |
| 96 OutputFile ="%(Lib.OutputFile)" | 96 OutputFile ="%(Lib.OutputFile)" |
| 97 PropertiesFile ="$(VCTargetsPath)\Platforms\NaCl\Pr
operties\nacl_lib.xml" | 97 PropertiesFile ="$(VCTargetsPath)\Platforms\NaCl\Pr
ops\nacl_lib.xml" |
| 98 TrackerLogDirectory ="%(Lib.TrackerLogDirectory)" | 98 TrackerLogDirectory ="%(Lib.TrackerLogDirectory)" |
| 99 TLogReadFiles ="@(LIBTLogReadFiles)" | 99 TLogReadFiles ="@(LIBTLogReadFiles)" |
| 100 TLogWriteFiles ="@(LIBTLogWriteFiles)" | 100 TLogWriteFiles ="@(LIBTLogWriteFiles)" |
| 101 ToolExe ="$(LIBToolExe)" | 101 ToolExe ="$(LIBToolExe)" |
| 102 ToolPath ="$(LIBToolPath)" | 102 ToolPath ="$(LIBToolPath)" |
| 103 TrackFileAccess ="$(TrackFileAccess)"> | 103 TrackFileAccess ="$(TrackFileAccess)"> |
| 104 <Output TaskParameter="SkippedExecution" PropertyName="LibSkippedExecuti
on" /> | 104 <Output TaskParameter="SkippedExecution" PropertyName="LibSkippedExecuti
on" /> |
| 105 </NaClLib> | 105 </NaClLib> |
| 106 | 106 |
| 107 <Message Condition="'$(LibSkippedExecution)' == 'false'" Text="$(MSBuildProj
ectFile) -> $(TargetPath)" Importance="High" /> | 107 <Message Condition="'$(LibSkippedExecution)' == 'false'" Text="$(MSBuildProj
ectFile) -> $(TargetPath)" Importance="High" /> |
| 108 | 108 |
| 109 </Target> | 109 </Target> |
| 110 | 110 |
| 111 <!-- Imports --> | 111 <!-- Imports --> |
| 112 <Import Project="$(VCTargetsPath)\Platforms\NaCl\NaCl.CppBuild.targets" /> | 112 <Import Project="$(VCTargetsPath)\Platforms\NaCl\NaCl.CppBuild.targets" /> |
| 113 <Import Project="$(VCTargetsPath)\Platforms\NaCl\PlatformToolsets\win_x86_newl
ib\Microsoft.Cpp.NaCl.win_x86_newlib.targets" Condition="'$(ToolchainName)' == '
newlib' AND (exists('$(VCTargetsPath)\Platforms\NaCl\PlatformToolsets\win_x86_ne
wlib\Microsoft.Cpp.NaCl.win_x86_newlib.targets'))" /> | 113 <Import Project="$(VCTargetsPath)\Platforms\NaCl\PlatformToolsets\win_x86_newl
ib\Microsoft.Cpp.NaCl.win_x86_newlib.targets" Condition="'$(ToolchainName)' == '
newlib' AND (exists('$(VCTargetsPath)\Platforms\NaCl\PlatformToolsets\win_x86_ne
wlib\Microsoft.Cpp.NaCl.win_x86_newlib.targets'))" /> |
| 114 <Import Project="$(VCTargetsPath)\Platforms\NaCl\PlatformToolsets\win_x86_glib
c\Microsoft.Cpp.NaCl.win_x86_glibc.targets" Condition="'$(ToolchainName)' == 'gl
ibc' AND (exists('$(VCTargetsPath)\Platforms\NaCl\PlatformToolsets\win_x86_glibc
\Microsoft.Cpp.NaCl.win_x86_glibc.targets'))" /> | 114 <Import Project="$(VCTargetsPath)\Platforms\NaCl\PlatformToolsets\win_x86_glib
c\Microsoft.Cpp.NaCl.win_x86_glibc.targets" Condition="'$(ToolchainName)' == 'gl
ibc' AND (exists('$(VCTargetsPath)\Platforms\NaCl\PlatformToolsets\win_x86_glibc
\Microsoft.Cpp.NaCl.win_x86_glibc.targets'))" /> |
| 115 | 115 |
| 116 </Project> | 116 </Project> |
| OLD | NEW |