Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(142)

Side by Side Diff: visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/Microsoft.Cpp.NaCl.targets

Issue 11044024: Implement multi-core builds in MSVS (Closed) Base URL: http://nativeclient-sdk.googlecode.com/svn/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Toolset.default.props » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 ProcessorNumber ="%(ClCompile.ProcessorNumbe r)"
29 MultiProcessorCompilation ="%(ClCompile.MultiProcessor Compilation)"
28 MinimalRebuildFromTracking ="%(ClCompile.MinimalRebuild FromTracking)" 30 MinimalRebuildFromTracking ="%(ClCompile.MinimalRebuild FromTracking)"
29 NaCLCompilerPath ="$(VSNaClSDKRoot)\toolchain \win_x86_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-gcc.exe" 31 NaCLCompilerPath ="$(VSNaClSDKRoot)\toolchain \win_x86_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-gcc.exe"
30 PropertiesFile ="$(VCTargetsPath)\Platfor ms\NaCl\Props\nacl_compile.xml" 32 PropertiesFile ="$(VCTargetsPath)\Platforms \NaCl\Props\nacl_compile.xml"
31 TLogReadFiles ="@(CLTLogReadFiles)" 33 TLogReadFiles ="@(CLTLogReadFiles)"
32 TLogWriteFiles ="@(CLTLogWriteFiles)" 34 TLogWriteFiles ="@(CLTLogWriteFiles)"
33 ToolExe ="$(CLToolExe)" 35 ToolExe ="$(CLToolExe)"
34 ToolPath ="$(CLToolPath)" 36 ToolPath ="$(CLToolPath)"
35 TrackFileAccess ="$(TrackFileAccess)" 37 TrackFileAccess ="$(TrackFileAccess)"
36 TrackerLogDirectory ="%(ClCompile.TrackerLogDire ctory)"> 38 TrackerLogDirectory ="%(ClCompile.TrackerLogDire ctory)">
37 </NaClCompile> 39 </NaClCompile>
38 </Target> 40 </Target>
39 41
40 <!-- ************************************************************************* ****************** 42 <!-- ************************************************************************* ******************
41 Link 43 Link
42 ************************************************************************* ****************** --> 44 ************************************************************************* ****************** -->
43 45
44 <Target Name="Link" 46 <Target Name="Link"
45 Condition="'@(Link)' != ''"> 47 Condition="'@(Link)' != ''">
46 48
47 <PropertyGroup> 49 <PropertyGroup>
48 <Link_MinimalRebuildFromTracking Condition="'@(Link->AnyHaveMetadataValue( 'MinimalRebuildFromTracking', 'false'))' == 'true'">false</Link_MinimalRebuildFr omTracking> 50 <Link_MinimalRebuildFromTracking Condition="'@(Link->AnyHaveMetadataValue( 'MinimalRebuildFromTracking', 'false'))' == 'true'">false</Link_MinimalRebuildFr omTracking>
49 <Link_MinimalRebuildFromTracking Condition="'$(BuildType)' != 'Build' or ' $(ForceRebuild)' == 'true'" >false</Link_MinimalRebuildFromTracking> 51 <Link_MinimalRebuildFromTracking Condition="'$(BuildType)' != 'Build' or ' $(ForceRebuild)' == 'true'" >false</Link_MinimalRebuildFromTracking>
50 <Link_MinimalRebuildFromTracking Condition="'$(Link_MinimalRebuildFromTrac king)' == ''">true</Link_MinimalRebuildFromTracking> 52 <Link_MinimalRebuildFromTracking Condition="'$(Link_MinimalRebuildFromTrac king)' == ''">true</Link_MinimalRebuildFromTracking>
51 </PropertyGroup> 53 </PropertyGroup>
52 54
53 <NaClLink BuildingInIDE ="$(BuildingInsideVisualStudio)" 55 <NaClLink BuildingInIDE ="$(BuildingInsideVisualStudio)"
54 Sources ="@(Link)" 56 Sources ="@(Link)"
55
56 OutputCommandLine ="%(Link.OutputCommandLine)" 57 OutputCommandLine ="%(Link.OutputCommandLine)"
57 NaClLinkerPath ="$(VSNaClSDKRoot)\toolchain\win_x8 6_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-g++.exe" 58 NaClLinkerPath ="$(VSNaClSDKRoot)\toolchain\win_x8 6_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-g++.exe"
58 MinimalRebuildFromTracking ="$(Link_MinimalRebuildFromTracking )" 59 MinimalRebuildFromTracking ="$(Link_MinimalRebuildFromTracking )"
59 OutputFile ="%(Link.OutputFile)" 60 OutputFile ="%(Link.OutputFile)"
60 PropertiesFile ="$(VCTargetsPath)\Platforms\NaCl \Props\nacl_link.xml" 61 PropertiesFile ="$(VCTargetsPath)\Platforms\NaCl \Props\nacl_link.xml"
61 TLogReadFiles ="@(LinkTLogReadFiles)" 62 TLogReadFiles ="@(LinkTLogReadFiles)"
62 TLogWriteFiles ="@(LinkTLogWriteFiles)" 63 TLogWriteFiles ="@(LinkTLogWriteFiles)"
63 ToolExe ="$(LinkToolExe)" 64 ToolExe ="$(LinkToolExe)"
64 ToolPath ="$(LinkToolPath)" 65 ToolPath ="$(LinkToolPath)"
65 TrackerLogDirectory ="%(Link.TrackerLogDirectory)" 66 TrackerLogDirectory ="%(Link.TrackerLogDirectory)"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 <Message Condition="'$(LibSkippedExecution)' == 'false'" Text="$(MSBuildProj ectFile) -&gt; $(TargetPath)" Importance="High" /> 108 <Message Condition="'$(LibSkippedExecution)' == 'false'" Text="$(MSBuildProj ectFile) -&gt; $(TargetPath)" Importance="High" />
108 109
109 </Target> 110 </Target>
110 111
111 <!-- Imports --> 112 <!-- Imports -->
112 <Import Project="$(VCTargetsPath)\Platforms\NaCl\NaCl.CppBuild.targets" /> 113 <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'))" /> 114 <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'))" /> 115 <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 116
116 </Project> 117 </Project>
OLDNEW
« no previous file with comments | « no previous file | visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Toolset.default.props » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698