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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 11360111: [NaCl Addin] Fix building of libraries in MSVS (Closed) Base URL: http://nativeclient-sdk.googlecode.com/svn/trunk/src
Patch Set: Created 8 years, 1 month 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/PNaCl/Microsoft.Cpp.PNaCl.targets » ('j') | visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/GCCUtilities.cs » ('J')
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)\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 16 matching lines...) Expand all
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_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-gcc.exe"
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 Platform ="$(Platform)" 35 Platform ="$(Platform)"
36 TrackFileAccess ="$(TrackFileAccess)" 36 TrackFileAccess ="$(TrackFileAccess)"
37 TrackerLogDirectory ="%(ClCompile.TrackerLogDire ctory)"> 37 TrackerLogDirectory ="%(ClCompile.TrackerLogDire ctory)"
38 ConfigurationType ="$(ConfigurationType)">
38 </NaClCompile> 39 </NaClCompile>
39 </Target> 40 </Target>
40 41
41 <!-- ************************************************************************* ****************** 42 <!-- ************************************************************************* ******************
42 Link 43 Link
43 ************************************************************************* ****************** --> 44 ************************************************************************* ****************** -->
44 45
45 <Target Name="Link" 46 <Target Name="Link"
46 Condition="'@(Link)' != ''"> 47 Condition="'@(Link)' != ''">
47 48
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 <NaClLib BuildingInIDE ="$(BuildingInsideVisualStudio)" 95 <NaClLib BuildingInIDE ="$(BuildingInsideVisualStudio)"
95 Sources ="@(Lib)" 96 Sources ="@(Lib)"
96 OutputCommandLine ="%(Lib.OutputCommandLine)" 97 OutputCommandLine ="%(Lib.OutputCommandLine)"
97 LibrarianToolPath ="$(VSNaClSDKRoot)toolchain\win_x86_ $(ToolchainName)\bin\$(TargetArchitecture)-nacl-ar.exe" 98 LibrarianToolPath ="$(VSNaClSDKRoot)toolchain\win_x86_ $(ToolchainName)\bin\$(TargetArchitecture)-nacl-ar.exe"
98 MinimalRebuildFromTracking ="%(Lib.MinimalRebuildFromTracking)" 99 MinimalRebuildFromTracking ="%(Lib.MinimalRebuildFromTracking)"
99 OutputFile ="%(Lib.OutputFile)" 100 OutputFile ="%(Lib.OutputFile)"
100 PropertiesFile ="$(VCTargetsPath)\NaCl\Props\nacl_l ib.xml" 101 PropertiesFile ="$(VCTargetsPath)\NaCl\Props\nacl_l ib.xml"
101 TrackerLogDirectory ="%(Lib.TrackerLogDirectory)" 102 TrackerLogDirectory ="%(Lib.TrackerLogDirectory)"
102 TLogReadFiles ="@(LIBTLogReadFiles)" 103 TLogReadFiles ="@(LIBTLogReadFiles)"
103 TLogWriteFiles ="@(LIBTLogWriteFiles)" 104 TLogWriteFiles ="@(LIBTLogWriteFiles)"
104 Platform ="$(Platform)"
105 TrackFileAccess ="$(TrackFileAccess)"> 105 TrackFileAccess ="$(TrackFileAccess)">
106 <Output TaskParameter="SkippedExecution" PropertyName="LibSkippedExecuti on" /> 106 <Output TaskParameter="SkippedExecution" PropertyName="LibSkippedExecuti on" />
107 </NaClLib> 107 </NaClLib>
108 108
109 <Message Condition="'$(LibSkippedExecution)' == 'false'" Text="$(MSBuildProj ectFile) -&gt; $(TargetPath)" Importance="High" /> 109 <Message Condition="'$(LibSkippedExecution)' == 'false'" Text="$(MSBuildProj ectFile) -&gt; $(TargetPath)" Importance="High" />
110 110
111 </Target> 111 </Target>
112 112
113 <!-- Imports --> 113 <!-- Imports -->
114 <Import Project="$(VCTargetsPath)\NaCl\NaCl.CppBuild.targets" /> 114 <Import Project="$(VCTargetsPath)\NaCl\NaCl.CppBuild.targets" />
115 <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'))" /> 115 <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'))" />
116 <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 <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'))" />
117 117
118 </Project> 118 </Project>
OLDNEW
« no previous file with comments | « no previous file | visual_studio/NativeClientVSAddIn/InstallerResources/PNaCl/Microsoft.Cpp.PNaCl.targets » ('j') | visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/GCCUtilities.cs » ('J')

Powered by Google App Engine
This is Rietveld 408576698