visual_studio/NativeClientVSAddIn/InstallerResources/PNaCl/Microsoft.Cpp.PNaCl.targets - Issue 11360111: [NaCl Addin] Fix building of libraries in MSVS

Side by Side Diff: visual_studio/NativeClientVSAddIn/InstallerResources/PNaCl/Microsoft.Cpp.PNaCl.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 | « visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.targets ('k') | visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/DependencyParser.cs » ('j') | visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/GCCUtilities.cs » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 16 matching lines...) Expand all Loading...
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_pnacl\newlib\bin\pnacl-clang.bat"	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 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 64 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
112 <Message Condition="'$(LibSkippedExecution)' == 'false'" Text="$(MSBuildProj ectFile) -> $(TargetPath)" Importance="High" />	113 <Message Condition="'$(LibSkippedExecution)' == 'false'" Text="$(MSBuildProj ectFile) -> $(TargetPath)" Importance="High" />

113	114

114 </Target>	115 </Target>

115	116

116 <!-- Imports -->	117 <!-- Imports -->

117 <Import Project="$(VCTargetsPath)\NaCl\NaCl.CppBuild.targets" />	118 <Import Project="$(VCTargetsPath)\NaCl\NaCl.CppBuild.targets" />

118 <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'))" />	119 <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'))" />

119 <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'))" />	120 <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'))" />

120	121

121 </Project>	122 </Project>

OLD	NEW