visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.targets - Issue 11266051: Add PNaCl support for VS addin.

Unified Diff: visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.targets

Issue 11266051: Add PNaCl support for VS addin. (Closed) Base URL: http://nativeclient-sdk.googlecode.com/svn/trunk/src

Patch Set: fix nits and tests 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.props ('k') | visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.props » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.targets

diff --git a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.targets b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.targets

index 34582ebb820f58f63970ae16158b646748b194ef..eab467cc69e0b65b1b08491c9d4fee32778d0055 100644

--- a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.targets

+++ b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.targets

@@ -28,12 +28,11 @@

ProcessorNumber ="%(ClCompile.ProcessorNumber)"

MultiProcessorCompilation ="%(ClCompile.MultiProcessorCompilation)"

MinimalRebuildFromTracking ="%(ClCompile.MinimalRebuildFromTracking)"

- NaCLCompilerPath ="$(VSNaClSDKRoot)\toolchain\win_x86_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-gcc.exe"

+ NaCLCompilerPath ="$(VSNaClSDKRoot)toolchain\win_x86_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-gcc.exe"

PropertiesFile ="$(VCTargetsPath)\NaCl\Props\nacl_compile.xml"

TLogReadFiles ="@(CLTLogReadFiles)"

TLogWriteFiles ="@(CLTLogWriteFiles)"

- ToolExe ="$(CLToolExe)"

- ToolPath ="$(CLToolPath)"

+ Platform ="$(Platform)"

TrackFileAccess ="$(TrackFileAccess)"

TrackerLogDirectory ="%(ClCompile.TrackerLogDirectory)">

</NaClCompile>

@@ -61,10 +60,9 @@

PropertiesFile ="$(VCTargetsPath)\NaCl\Props\nacl_link.xml"

TLogReadFiles ="@(LinkTLogReadFiles)"

TLogWriteFiles ="@(LinkTLogWriteFiles)"

- ToolExe ="$(LinkToolExe)"

- ToolPath ="$(LinkToolPath)"

- TrackerLogDirectory ="%(Link.TrackerLogDirectory)"

+ Platform ="$(Platform)"

TrackFileAccess ="$(TrackFileAccess)"

+ TrackerLogDirectory ="%(Link.TrackerLogDirectory)"

ConfigurationType ="$(ConfigurationType)">

</NaClLink>

@@ -92,15 +90,14 @@

<NaClLib BuildingInIDE ="$(BuildingInsideVisualStudio)"

Sources ="@(Lib)"

OutputCommandLine ="%(Lib.OutputCommandLine)"

- LibrarianToolPath ="$(VSNaClSDKRoot)\toolchain\win_x86_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-ar.exe"

+ LibrarianToolPath ="$(VSNaClSDKRoot)toolchain\win_x86_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-ar.exe"

MinimalRebuildFromTracking ="%(Lib.MinimalRebuildFromTracking)"

OutputFile ="%(Lib.OutputFile)"

PropertiesFile ="$(VCTargetsPath)\NaCl\Props\nacl_lib.xml"

TrackerLogDirectory ="%(Lib.TrackerLogDirectory)"

TLogReadFiles ="@(LIBTLogReadFiles)"

TLogWriteFiles ="@(LIBTLogWriteFiles)"

- ToolExe ="$(LIBToolExe)"

- ToolPath ="$(LIBToolPath)"

+ Platform ="$(Platform)"

TrackFileAccess ="$(TrackFileAccess)">

</NaClLib>