Chromium Code Reviews| 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-gcc.exe" |
|
noelallen1
2012/10/01 18:54:17
How are you compiling files that are C++?
Sam Clegg
2012/10/01 19:37:32
Apparently if you call "gcc" it will detect the fi
| |
| 30 PropertiesFile ="$(VCTargetsPath)\Platfor ms\NaCl\Props\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 |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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 |