Index: visual_studio/NativeClientVSAddIn/InstallerResources/PNaCl/Microsoft.Cpp.PNaCl.targets |
diff --git a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.targets b/visual_studio/NativeClientVSAddIn/InstallerResources/PNaCl/Microsoft.Cpp.PNaCl.targets |
similarity index 86% |
copy from visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.targets |
copy to visual_studio/NativeClientVSAddIn/InstallerResources/PNaCl/Microsoft.Cpp.PNaCl.targets |
index 34582ebb820f58f63970ae16158b646748b194ef..2bdb65047ae9fdee5d54e29edb54ee5f2d319953 100644 |
--- a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.targets |
+++ b/visual_studio/NativeClientVSAddIn/InstallerResources/PNaCl/Microsoft.Cpp.PNaCl.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_pnacl\newlib\bin\pnacl-clang.bat" |
PropertiesFile ="$(VCTargetsPath)\NaCl\Props\nacl_compile.xml" |
TLogReadFiles ="@(CLTLogReadFiles)" |
TLogWriteFiles ="@(CLTLogWriteFiles)" |
- ToolExe ="$(CLToolExe)" |
- ToolPath ="$(CLToolPath)" |
+ Platform ="$(Platform)" |
TrackFileAccess ="$(TrackFileAccess)" |
TrackerLogDirectory ="%(ClCompile.TrackerLogDirectory)"> |
</NaClCompile> |
@@ -55,17 +54,19 @@ |
<NaClLink BuildingInIDE ="$(BuildingInsideVisualStudio)" |
Sources ="@(Link)" |
OutputCommandLine ="%(Link.OutputCommandLine)" |
- NaClLinkerPath ="$(VSNaClSDKRoot)\toolchain\win_x86_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-g++.exe" |
+ NaClLinkerPath ="$(VSNaClSDKRoot)toolchain\win_x86_pnacl\newlib\bin\pnacl-clang++.bat" |
MinimalRebuildFromTracking ="$(Link_MinimalRebuildFromTracking)" |
OutputFile ="%(Link.OutputFile)" |
- PropertiesFile ="$(VCTargetsPath)\NaCl\Props\nacl_link.xml" |
+ PropertiesFile ="$(VCTargetsPath)\NaCl\Props\pnacl_link.xml" |
TLogReadFiles ="@(LinkTLogReadFiles)" |
TLogWriteFiles ="@(LinkTLogWriteFiles)" |
- ToolExe ="$(LinkToolExe)" |
- ToolPath ="$(LinkToolPath)" |
- TrackerLogDirectory ="%(Link.TrackerLogDirectory)" |
+ Platform ="$(Platform)" |
+ TranslateX86 ="%(Link.TranslateX86)" |
+ TranslateX64 ="%(Link.TranslateX64)" |
+ TranslateARM ="%(Link.TranslateARM)" |
TrackFileAccess ="$(TrackFileAccess)" |
- ConfigurationType ="$(ConfigurationType)"> |
+ TrackerLogDirectory ="%(Link.TrackerLogDirectory)" |
+ ConfigurationType ="$(ConfigurationType)"> |
<Output TaskParameter="SkippedExecution" PropertyName="LinkSkippedExecution" /> |
</NaClLink> |
@@ -92,15 +93,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_pnacl\newlib\bin\pnacl-ar.bat" |
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)"> |
<Output TaskParameter="SkippedExecution" PropertyName="LibSkippedExecution" /> |
</NaClLib> |
@@ -111,7 +111,7 @@ |
<!-- Imports --> |
<Import Project="$(VCTargetsPath)\NaCl\NaCl.CppBuild.targets" /> |
- <Import Project="$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.NaCl.win_x86_newlib.targets" Condition="'$(ToolchainName)' == 'newlib' AND (exists('$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.NaCl.win_x86_newlib.targets'))" /> |
+ <Import Project="$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.NaCl.win_x86_newlib.targets" Condition="'pnacl' == 'newlib' AND (exists('$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.NaCl.win_x86_newlib.targets'))" /> |
<Import Project="$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_glibc\Microsoft.Cpp.NaCl.win_x86_glibc.targets" Condition="'$(ToolchainName)' == 'glibc' AND (exists('$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_glibc\Microsoft.Cpp.NaCl.win_x86_glibc.targets'))" /> |
</Project> |