Index: visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Paths.default.props |
diff --git a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Paths.default.props b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Paths.default.props |
index 16533fe6a344ee011fd6f6fb66930d5715b14266..528de00237979f2525122d271507abf6e5db718c 100644 |
--- a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Paths.default.props |
+++ b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Paths.default.props |
@@ -21,7 +21,7 @@ |
<FrameworkSdkDir Condition="'$(FrameworkSdkDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)</FrameworkSdkDir> |
<ExecutablePath Condition="'$(ExecutablePath)' == ''">$(PATH);</ExecutablePath> |
- <IncludePath Condition="'$(IncludePath)' == ''">$(VSNaClSDKRoot)include;</IncludePath> |
+ <IncludePath Condition="'$(IncludePath)' == ''">$(NaClDefaultIncludePath);$(VSNaClSDKRoot)include;</IncludePath> |
<LibraryPath Condition="'$(LibraryPath)' == '' AND '$(TargetArchitecture)'=='i686'">$(VSNaClSDKRoot)lib\$(ToolchainName)_x86_32\$(Configuration);</LibraryPath> |
<LibraryPath Condition="'$(LibraryPath)' == '' AND '$(TargetArchitecture)'=='x86_64'">$(VSNaClSDKRoot)lib\$(ToolchainName)_x86_64\$(Configuration);</LibraryPath> |
<LibraryPath Condition="'$(LibraryPath)' == '' AND '$(TargetArchitecture)'=='arm'">$(VSNaClSDKRoot)lib\$(ToolchainName)_arm\$(Configuration);</LibraryPath> |