visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/Microsoft.Cpp.NaCl.targets - Issue 10826232: NaCl VS Add-in User Changed Properties Fix

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

Issue 10826232: NaCl VS Add-in User Changed Properties Fix (Closed) Base URL: https://nativeclient-sdk.googlecode.com/svn/trunk/src

Patch Set: Created 8 years, 4 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/NaCl/Microsoft.Cpp.NaCl.props ('k') | visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/Microsoft.Cpp.NaCl.default.props » ('j') | visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/Connect.cs » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index a197d6e2c89b347b4bc47b837b3000103f94ee8c..db3e35997fa578e6a81ace493a48114f4fd34a5d 100644

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

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

@@ -27,7 +27,7 @@

Sources ="@(ClCompile)"

OutputCommandLine ="%(ClCompile.OutputCommandLine)"

MinimalRebuildFromTracking ="%(ClCompile.MinimalRebuildFromTracking)"

- NaCLCompilerPath ="$(NaClCompiler)"

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

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

TLogReadFiles ="@(CLTLogReadFiles)"

TLogWriteFiles ="@(CLTLogWriteFiles)"

@@ -55,7 +55,7 @@

Sources ="@(Link)"

OutputCommandLine ="%(Link.OutputCommandLine)"

- NaClLinkerPath ="$(NaClLinker)"

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

MinimalRebuildFromTracking ="$(Link_MinimalRebuildFromTracking)"

OutputFile ="%(Link.OutputFile)"

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

@@ -92,7 +92,7 @@

<NaClLib BuildingInIDE ="$(BuildingInsideVisualStudio)"

Sources ="@(Lib)"

OutputCommandLine ="%(Lib.OutputCommandLine)"

- LibrarianToolPath ="$(NaClLibrarian)"

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

MinimalRebuildFromTracking ="%(Lib.MinimalRebuildFromTracking)"

OutputFile ="%(Lib.OutputFile)"

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

@@ -111,7 +111,9 @@

- <Import Project="$(VCTargetsPath)\Platforms\NaCl\PlatformToolsets\$(PlatformToolset)\Microsoft.Cpp.NaCl.$(PlatformToolset).targets" Condition="(exists('$(VCTargetsPath)\Platforms\NaCl\PlatformToolsets\$(PlatformToolset)\Microsoft.Cpp.NaCl.$(PlatformToolset).targets'))" />

+ <Import Project="$(VCTargetsPath)\Platforms\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.NaCl.win_x86_newlib.targets" Condition="'$(ToolchainName)' == 'newlib' AND (exists('$(VCTargetsPath)\Platforms\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.NaCl.win_x86_newlib.targets'))" />

+ <Import Project="$(VCTargetsPath)\Platforms\NaCl\PlatformToolsets\win_x86_glibc\Microsoft.Cpp.NaCl.win_x86_glibc.targets" Condition="'$(ToolchainName)' == 'glibc' AND (exists('$(VCTargetsPath)\Platforms\NaCl\PlatformToolsets\win_x86_glibc\Microsoft.Cpp.NaCl.win_x86_glibc.targets'))" />

</Project>