Index: visual_studio/NativeClientVSAddIn/InstallerResources/NaClARM/Microsoft.Cpp.NaCLARM.default.props |
diff --git a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.props b/visual_studio/NativeClientVSAddIn/InstallerResources/NaClARM/Microsoft.Cpp.NaCLARM.default.props |
similarity index 62% |
copy from visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.props |
copy to visual_studio/NativeClientVSAddIn/InstallerResources/NaClARM/Microsoft.Cpp.NaCLARM.default.props |
index af1c19484c3323b0c768500cb6081dc457be94a3..65ba16b4ddb0c6e1eb61dd93497c251437977df6 100644 |
--- a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.props |
+++ b/visual_studio/NativeClientVSAddIn/InstallerResources/NaClARM/Microsoft.Cpp.NaCLARM.default.props |
@@ -1,9 +1,9 @@ |
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
<PropertyGroup> |
- <PlatformShortName>NaCl64</PlatformShortName> |
- <PlatformArchitecture>64</PlatformArchitecture> |
- <TargetArchitecture>x86_64</TargetArchitecture> |
+ <PlatformShortName>NaClARM</PlatformShortName> |
+ <PlatformArchitecture>arm</PlatformArchitecture> |
+ <TargetArchitecture>arm</TargetArchitecture> |
<PlatformToolset Condition="'$(PlatformToolset)' == ''">v110</PlatformToolset> |
<ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> |
@@ -20,6 +20,15 @@ |
<OutDir Condition="'$(OutDir)'==''">DUMMY</OutDir> |
<VSNaClSDKRoot Condition="'$(VSNaClSDKRoot)'==''">$(NACL_SDK_ROOT)\</VSNaClSDKRoot> |
+ |
+ <NaClToolchainRoot>$(VSNaClSDKRoot)toolchain\win_arm_$(ToolchainName)\</NaClToolchainRoot> |
+ |
+ <NaClDefaultIncludePath Condition="'$(NaClDefaultIncludePath)'==''">$(NaClToolchainRoot)$(TargetArchitecture)-nacl\usr\include;$(NaClToolchainRoot)arm-nacl\include</NaClDefaultIncludePath> |
+ |
+ <NaClDefaultIncludePath Condition="Exists('$(NaClToolchainRoot)lib\gcc\arm-nacl\4.8.2')">$(NaClDefaultIncludePath);$(NaClToolchainRoot)arm-nacl\include\c++\4.8.2;$(NaClToolchainRoot)lib\gcc\arm-nacl\4.8.2\include</NaClDefaultIncludePath> |
+ |
+ <NaClDefaultIncludePath Condition="Exists('$(NaClToolchainRoot)lib\gcc\arm-nacl\4.8.3')">$(NaClDefaultIncludePath);$(NaClToolchainRoot)arm-nacl\include\c++\4.8.3;$(NaClToolchainRoot)lib\gcc\arm-nacl\4.8.3\include</NaClDefaultIncludePath> |
+ |
<NaClWebServerPort Condition="'$(NaClWebServerPort)'==''">5103</NaClWebServerPort> |
<NaClIndexHTML Condition="'$(NaClIndexHTML)'==''">index.html</NaClIndexHTML> |
<NaClManifestPath Condition="'$(NaClManifestPath)'==''"></NaClManifestPath> |