[VS Addin] Add default compiler include paths to visual studio

visual_studio/NativeClientVSAddIn/InstallerResources/PNaCl/Microsoft.Cpp.PNaCl.default.props

Index: visual_studio/NativeClientVSAddIn/InstallerResources/PNaCl/Microsoft.Cpp.PNaCl.default.props
diff --git a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.props b/visual_studio/NativeClientVSAddIn/InstallerResources/PNaCl/Microsoft.Cpp.PNaCl.default.props
similarity index 57%
copy from visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.props
copy to visual_studio/NativeClientVSAddIn/InstallerResources/PNaCl/Microsoft.Cpp.PNaCl.default.props
index af1c19484c3323b0c768500cb6081dc457be94a3..183dbb53d6b4b2cdf253e7bdb2b15303a9d458a0 100644
--- a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.props
+++ b/visual_studio/NativeClientVSAddIn/InstallerResources/PNaCl/Microsoft.Cpp.PNaCl.default.props
@@ -1,13 +1,13 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <PlatformShortName>NaCl64</PlatformShortName>
-    <PlatformArchitecture>64</PlatformArchitecture>
-    <TargetArchitecture>x86_64</TargetArchitecture>
+    <PlatformShortName>PNaCl</PlatformShortName>
+    <PlatformArchitecture>32</PlatformArchitecture>
+    <TargetArchitecture>pnacl</TargetArchitecture>
     <PlatformToolset Condition="'$(PlatformToolset)' == ''">v110</PlatformToolset>
 
     <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
-    <TargetName Condition="'$(TargetName)'==''">$(ProjectName)_$(PlatformArchitecture)</TargetName>
+    <TargetName Condition="'$(TargetName)'==''">$(ProjectName)</TargetName>
     <ToolchainName Condition="'$(ToolchainName)' == ''">newlib</ToolchainName>
     <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'!=''">$(IntermediateOutputPath)</IntDir>
 
@@ -20,6 +20,17 @@
     <OutDir Condition="'$(OutDir)'==''">DUMMY</OutDir>
 
     <VSNaClSDKRoot Condition="'$(VSNaClSDKRoot)'==''">$(NACL_SDK_ROOT)\</VSNaClSDKRoot>
+
+    <NaClToolchainRoot>$(VSNaClSDKRoot)toolchain\win_pnacl\</NaClToolchainRoot>
+
+    <NaClDefaultIncludePath Condition="'$(NaClDefaultIncludePath)'==''">$(NaClToolchainRoot)usr\local\include;$(NaClToolchainRoot)usr\include</NaClDefaultIncludePath>
+
+    <NaClDefaultIncludePath Condition="!Exists('$(NaClToolchainRoot)host_x86_32\lib\clang\3.4')">$(NaClDefaultIncludePath);$(NaClToolchainRoot)\lib\clang\3.4\include</NaClDefaultIncludePath>
+
+    <NaClDefaultIncludePath Condition="Exists('$(NaClToolchainRoot)host_x86_32\lib\clang\3.4')">$(NaClDefaultIncludePath);$(NaClToolchainRoot)host_x86_32\lib\clang\3.4\include</NaClDefaultIncludePath>
+
+    <NaClDefaultIncludePath Condition="Exists('$(NaClToolchainRoot)usr\include\c++\v1')">$(NaClDefaultIncludePath);$(NaClToolchainRoot)usr\include\c++\v1</NaClDefaultIncludePath>
+
     <NaClWebServerPort Condition="'$(NaClWebServerPort)'==''">5103</NaClWebServerPort>
     <NaClIndexHTML Condition="'$(NaClIndexHTML)'==''">index.html</NaClIndexHTML>
     <NaClManifestPath Condition="'$(NaClManifestPath)'==''"></NaClManifestPath>