NaCl VS Add-in User Changed Properties Fix

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

 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(VCTargetsPath)\Platforms\NaCl\ImportBefore\*.targets" Condition="Exists('$(VCTargetsPath)\Platforms\NaCl\ImportBefore')" />
   <Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" />
 
   <UsingTask TaskName="NaClCompile" AssemblyFile="$(VCTargetsPath)\Platforms\NaCl\NaCl.Build.CPPTasks.dll" />
   <UsingTask TaskName="NaClLink" AssemblyFile="$(VCTargetsPath)\Platforms\NaCl\NaCl.Build.CPPTasks.dll" />
   <UsingTask TaskName="NaClLib" AssemblyFile="$(VCTargetsPath)\Platforms\NaCl\NaCl.Build.CPPTasks.dll" />
   <UsingTask TaskName="VCMessage" AssemblyName="Microsoft.Build.CppTasks.Common, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 
   
   <PropertyGroup>
     <!-- Enable incremental build by enable file tracking in tasks-->
     <TrackFileAccess Condition="'$(TrackFileAccess)' == ''">true</TrackFileAccess>
   </PropertyGroup>
 
   <!-- *******************************************************************************************
         CLCompile
        ******************************************************************************************* -->
 
   <Target Name="ClCompile"
           Condition="'@(ClCompile)' != ''"
           DependsOnTargets="SelectClCompile">
 
     <NaClCompile Condition="'%(ClCompile.ExcludedFromBuild)'!='true'"
                  BuildingInIDE                      ="$(BuildingInsideVisualStudio)"
                  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)"
                  ToolExe                            ="$(CLToolExe)"
                  ToolPath                           ="$(CLToolPath)"
                  TrackFileAccess                    ="$(TrackFileAccess)"
                  TrackerLogDirectory                ="%(ClCompile.TrackerLogDirectory)">
     </NaClCompile>
   </Target>
 
   <!-- *******************************************************************************************
         Link
        ******************************************************************************************* -->
 
   <Target Name="Link"
           Condition="'@(Link)' != ''">
 
     <PropertyGroup>
       <Link_MinimalRebuildFromTracking Condition="'@(Link->AnyHaveMetadataValue('MinimalRebuildFromTracking', 'false'))' == 'true'">false</Link_MinimalRebuildFromTracking>
       <Link_MinimalRebuildFromTracking Condition="'$(BuildType)' != 'Build' or '$(ForceRebuild)' == 'true'" >false</Link_MinimalRebuildFromTracking>
       <Link_MinimalRebuildFromTracking Condition="'$(Link_MinimalRebuildFromTracking)' == ''">true</Link_MinimalRebuildFromTracking>
     </PropertyGroup>
     
     <NaClLink BuildingInIDE                  ="$(BuildingInsideVisualStudio)"
               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"
               TLogReadFiles                  ="@(LinkTLogReadFiles)"
               TLogWriteFiles                 ="@(LinkTLogWriteFiles)"
               ToolExe                        ="$(LinkToolExe)"
               ToolPath                       ="$(LinkToolPath)"
               TrackerLogDirectory            ="%(Link.TrackerLogDirectory)"
               TrackFileAccess                ="$(TrackFileAccess)"
                           ConfigurationType              ="$(ConfigurationType)">
@@ skipping 16 matching lines @@
     
     <ItemGroup>
       <Lib>
         <MinimalRebuildFromTracking Condition="'%(Lib.MinimalRebuildFromTracking)' == '' and '$(BuildType)' == 'Build' and '$(ForceRebuild)' != 'true'">true</MinimalRebuildFromTracking>
       </Lib>
     </ItemGroup>
 
     <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"
              TrackerLogDirectory            ="%(Lib.TrackerLogDirectory)"
              TLogReadFiles                  ="@(LIBTLogReadFiles)"
              TLogWriteFiles                 ="@(LIBTLogWriteFiles)"
              ToolExe                        ="$(LIBToolExe)"
              ToolPath                       ="$(LIBToolPath)"
              TrackFileAccess                ="$(TrackFileAccess)">
         <Output TaskParameter="SkippedExecution" PropertyName="LibSkippedExecution" />
     </NaClLib>
 
     <Message Condition="'$(LibSkippedExecution)' == 'false'" Text="$(MSBuildProjectFile) -&gt; $(TargetPath)" Importance="High" />
     
   </Target>
   
   <!-- Imports -->
   <Import Project="$(VCTargetsPath)\Platforms\NaCl\NaCl.CppBuild.targets" />    
-  <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>