| 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 <UsingTask TaskName="NaClCompile" AssemblyFile="$(VCTargetsPath)\NaCl\NaCl.Bui
ld.CPPTasks.dll" /> | 5 <UsingTask TaskName="NaClCompile" AssemblyFile="$(VCTargetsPath)\NaCl\NaCl.Bui
ld.CPPTasks.dll" /> |
| 6 <UsingTask TaskName="NaClLink" AssemblyFile="$(VCTargetsPath)\NaCl\NaCl.Build.
CPPTasks.dll" /> | 6 <UsingTask TaskName="NaClLink" AssemblyFile="$(VCTargetsPath)\NaCl\NaCl.Build.
CPPTasks.dll" /> |
| 7 <UsingTask TaskName="NaClLib" AssemblyFile="$(VCTargetsPath)\NaCl\NaCl.Build.C
PPTasks.dll" /> | 7 <UsingTask TaskName="NaClLib" AssemblyFile="$(VCTargetsPath)\NaCl\NaCl.Build.C
PPTasks.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 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 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 ProcessorNumber ="%(ClCompile.ProcessorNumbe
r)" | 28 ProcessorNumber ="%(ClCompile.ProcessorNumbe
r)" |
| 29 MultiProcessorCompilation ="%(ClCompile.MultiProcessor
Compilation)" | 29 MultiProcessorCompilation ="%(ClCompile.MultiProcessor
Compilation)" |
| 30 MinimalRebuildFromTracking ="%(ClCompile.MinimalRebuild
FromTracking)" | 30 MinimalRebuildFromTracking ="%(ClCompile.MinimalRebuild
FromTracking)" |
| 31 NaCLCompilerPath ="$(VSNaClSDKRoot)\toolchain
\win_x86_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-gcc.exe" | 31 NaCLCompilerPath ="$(VSNaClSDKRoot)toolchain\
win_x86_pnacl\newlib\bin\pnacl-clang.bat" |
| 32 PropertiesFile ="$(VCTargetsPath)\NaCl\Prop
s\nacl_compile.xml" | 32 PropertiesFile ="$(VCTargetsPath)\NaCl\Prop
s\nacl_compile.xml" |
| 33 TLogReadFiles ="@(CLTLogReadFiles)" | 33 TLogReadFiles ="@(CLTLogReadFiles)" |
| 34 TLogWriteFiles ="@(CLTLogWriteFiles)" | 34 TLogWriteFiles ="@(CLTLogWriteFiles)" |
| 35 ToolExe ="$(CLToolExe)" | 35 Platform ="$(Platform)" |
| 36 ToolPath ="$(CLToolPath)" | |
| 37 TrackFileAccess ="$(TrackFileAccess)" | 36 TrackFileAccess ="$(TrackFileAccess)" |
| 38 TrackerLogDirectory ="%(ClCompile.TrackerLogDire
ctory)"> | 37 TrackerLogDirectory ="%(ClCompile.TrackerLogDire
ctory)"> |
| 39 </NaClCompile> | 38 </NaClCompile> |
| 40 </Target> | 39 </Target> |
| 41 | 40 |
| 42 <!-- *************************************************************************
****************** | 41 <!-- *************************************************************************
****************** |
| 43 Link | 42 Link |
| 44 *************************************************************************
****************** --> | 43 *************************************************************************
****************** --> |
| 45 | 44 |
| 46 <Target Name="Link" | 45 <Target Name="Link" |
| 47 Condition="'@(Link)' != ''"> | 46 Condition="'@(Link)' != ''"> |
| 48 | 47 |
| 49 <PropertyGroup> | 48 <PropertyGroup> |
| 50 <Link_MinimalRebuildFromTracking Condition="'@(Link->AnyHaveMetadataValue(
'MinimalRebuildFromTracking', 'false'))' == 'true'">false</Link_MinimalRebuildFr
omTracking> | 49 <Link_MinimalRebuildFromTracking Condition="'@(Link->AnyHaveMetadataValue(
'MinimalRebuildFromTracking', 'false'))' == 'true'">false</Link_MinimalRebuildFr
omTracking> |
| 51 <Link_MinimalRebuildFromTracking Condition="'$(BuildType)' != 'Build' or '
$(ForceRebuild)' == 'true'" >false</Link_MinimalRebuildFromTracking> | 50 <Link_MinimalRebuildFromTracking Condition="'$(BuildType)' != 'Build' or '
$(ForceRebuild)' == 'true'" >false</Link_MinimalRebuildFromTracking> |
| 52 <Link_MinimalRebuildFromTracking Condition="'$(Link_MinimalRebuildFromTrac
king)' == ''">true</Link_MinimalRebuildFromTracking> | 51 <Link_MinimalRebuildFromTracking Condition="'$(Link_MinimalRebuildFromTrac
king)' == ''">true</Link_MinimalRebuildFromTracking> |
| 53 </PropertyGroup> | 52 </PropertyGroup> |
| 54 | 53 |
| 55 <NaClLink BuildingInIDE ="$(BuildingInsideVisualStudio)" | 54 <NaClLink BuildingInIDE ="$(BuildingInsideVisualStudio)" |
| 56 Sources ="@(Link)" | 55 Sources ="@(Link)" |
| 57 OutputCommandLine ="%(Link.OutputCommandLine)" | 56 OutputCommandLine ="%(Link.OutputCommandLine)" |
| 58 NaClLinkerPath ="$(VSNaClSDKRoot)\toolchain\win_x8
6_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-g++.exe" | 57 NaClLinkerPath ="$(VSNaClSDKRoot)toolchain\win_x86
_pnacl\newlib\bin\pnacl-clang++.bat" |
| 59 MinimalRebuildFromTracking ="$(Link_MinimalRebuildFromTracking
)" | 58 MinimalRebuildFromTracking ="$(Link_MinimalRebuildFromTracking
)" |
| 60 OutputFile ="%(Link.OutputFile)" | 59 OutputFile ="%(Link.OutputFile)" |
| 61 PropertiesFile ="$(VCTargetsPath)\NaCl\Props\nacl_
link.xml" | 60 PropertiesFile ="$(VCTargetsPath)\NaCl\Props\pnacl
_link.xml" |
| 62 TLogReadFiles ="@(LinkTLogReadFiles)" | 61 TLogReadFiles ="@(LinkTLogReadFiles)" |
| 63 TLogWriteFiles ="@(LinkTLogWriteFiles)" | 62 TLogWriteFiles ="@(LinkTLogWriteFiles)" |
| 64 ToolExe ="$(LinkToolExe)" | 63 Platform ="$(Platform)" |
| 65 ToolPath ="$(LinkToolPath)" | 64 TranslateX86 ="%(Link.TranslateX86)" |
| 65 TranslateX64 ="%(Link.TranslateX64)" |
| 66 TranslateARM ="%(Link.TranslateARM)" |
| 67 TrackFileAccess ="$(TrackFileAccess)" |
| 66 TrackerLogDirectory ="%(Link.TrackerLogDirectory)" | 68 TrackerLogDirectory ="%(Link.TrackerLogDirectory)" |
| 67 TrackFileAccess ="$(TrackFileAccess)" | 69 ConfigurationType ="$(ConfigurationType)"> |
| 68 ConfigurationType ="$(ConfigurationType)"> | |
| 69 <Output TaskParameter="SkippedExecution" PropertyName="LinkSkippedExecutio
n" /> | 70 <Output TaskParameter="SkippedExecution" PropertyName="LinkSkippedExecutio
n" /> |
| 70 </NaClLink> | 71 </NaClLink> |
| 71 | 72 |
| 72 <Message Condition="'$(LinkSkippedExecution)' == 'false'" Text="$(MSBuildPro
jectFile) -> $(TargetPath)" Importance="High" /> | 73 <Message Condition="'$(LinkSkippedExecution)' == 'false'" Text="$(MSBuildPro
jectFile) -> $(TargetPath)" Importance="High" /> |
| 73 | 74 |
| 74 </Target> | 75 </Target> |
| 75 | 76 |
| 76 | 77 |
| 77 <!-- *************************************************************************
****************** | 78 <!-- *************************************************************************
****************** |
| 78 Lib | 79 Lib |
| 79 *************************************************************************
****************** --> | 80 *************************************************************************
****************** --> |
| 80 | 81 |
| 81 <!-- Lib script based on: MSBuild\Microsoft.Cpp\v4.0\Microsoft.CppCommon.targe
ts --> | 82 <!-- Lib script based on: MSBuild\Microsoft.Cpp\v4.0\Microsoft.CppCommon.targe
ts --> |
| 82 | 83 |
| 83 <Target Name="Lib" | 84 <Target Name="Lib" |
| 84 Condition="'@(Lib)' != ''"> | 85 Condition="'@(Lib)' != ''"> |
| 85 | 86 |
| 86 <ItemGroup> | 87 <ItemGroup> |
| 87 <Lib> | 88 <Lib> |
| 88 <MinimalRebuildFromTracking Condition="'%(Lib.MinimalRebuildFromTracking
)' == '' and '$(BuildType)' == 'Build' and '$(ForceRebuild)' != 'true'">true</Mi
nimalRebuildFromTracking> | 89 <MinimalRebuildFromTracking Condition="'%(Lib.MinimalRebuildFromTracking
)' == '' and '$(BuildType)' == 'Build' and '$(ForceRebuild)' != 'true'">true</Mi
nimalRebuildFromTracking> |
| 89 </Lib> | 90 </Lib> |
| 90 </ItemGroup> | 91 </ItemGroup> |
| 91 | 92 |
| 92 <NaClLib BuildingInIDE ="$(BuildingInsideVisualStudio)" | 93 <NaClLib BuildingInIDE ="$(BuildingInsideVisualStudio)" |
| 93 Sources ="@(Lib)" | 94 Sources ="@(Lib)" |
| 94 OutputCommandLine ="%(Lib.OutputCommandLine)" | 95 OutputCommandLine ="%(Lib.OutputCommandLine)" |
| 95 LibrarianToolPath ="$(VSNaClSDKRoot)\toolchain\win_x86
_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-ar.exe" | 96 LibrarianToolPath ="$(VSNaClSDKRoot)toolchain\win_x86_
pnacl\newlib\bin\pnacl-ar.bat" |
| 96 MinimalRebuildFromTracking ="%(Lib.MinimalRebuildFromTracking)" | 97 MinimalRebuildFromTracking ="%(Lib.MinimalRebuildFromTracking)" |
| 97 OutputFile ="%(Lib.OutputFile)" | 98 OutputFile ="%(Lib.OutputFile)" |
| 98 PropertiesFile ="$(VCTargetsPath)\NaCl\Props\nacl_l
ib.xml" | 99 PropertiesFile ="$(VCTargetsPath)\NaCl\Props\nacl_l
ib.xml" |
| 99 TrackerLogDirectory ="%(Lib.TrackerLogDirectory)" | 100 TrackerLogDirectory ="%(Lib.TrackerLogDirectory)" |
| 100 TLogReadFiles ="@(LIBTLogReadFiles)" | 101 TLogReadFiles ="@(LIBTLogReadFiles)" |
| 101 TLogWriteFiles ="@(LIBTLogWriteFiles)" | 102 TLogWriteFiles ="@(LIBTLogWriteFiles)" |
| 102 ToolExe ="$(LIBToolExe)" | 103 Platform ="$(Platform)" |
| 103 ToolPath ="$(LIBToolPath)" | |
| 104 TrackFileAccess ="$(TrackFileAccess)"> | 104 TrackFileAccess ="$(TrackFileAccess)"> |
| 105 <Output TaskParameter="SkippedExecution" PropertyName="LibSkippedExecuti
on" /> | 105 <Output TaskParameter="SkippedExecution" PropertyName="LibSkippedExecuti
on" /> |
| 106 </NaClLib> | 106 </NaClLib> |
| 107 | 107 |
| 108 <Message Condition="'$(LibSkippedExecution)' == 'false'" Text="$(MSBuildProj
ectFile) -> $(TargetPath)" Importance="High" /> | 108 <Message Condition="'$(LibSkippedExecution)' == 'false'" Text="$(MSBuildProj
ectFile) -> $(TargetPath)" Importance="High" /> |
| 109 | 109 |
| 110 </Target> | 110 </Target> |
| 111 | 111 |
| 112 <!-- Imports --> | 112 <!-- Imports --> |
| 113 <Import Project="$(VCTargetsPath)\NaCl\NaCl.CppBuild.targets" /> | 113 <Import Project="$(VCTargetsPath)\NaCl\NaCl.CppBuild.targets" /> |
| 114 <Import Project="$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microso
ft.Cpp.NaCl.win_x86_newlib.targets" Condition="'$(ToolchainName)' == 'newlib' AN
D (exists('$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.N
aCl.win_x86_newlib.targets'))" /> | 114 <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'))" /> |
| 115 <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'))" /> | 115 <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'))" /> |
| 116 | 116 |
| 117 </Project> | 117 </Project> |
| OLD | NEW |