Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(207)

Unified Diff: visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Paths.default.props

Issue 594733002: [VS Addin] Add default compiler include paths to visual studio (Closed) Base URL: https://nativeclient-sdk.googlecode.com/svn/trunk/src
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | visual_studio/NativeClientVSAddIn/InstallerResources/NaCl32/Microsoft.Cpp.NaCL32.default.props » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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>
« no previous file with comments | « no previous file | visual_studio/NativeClientVSAddIn/InstallerResources/NaCl32/Microsoft.Cpp.NaCL32.default.props » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698