visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Paths.default.props - Issue 11266051: Add PNaCl support for VS addin.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 11266051: Add PNaCl support for VS addin. (Closed) Base URL: http://nativeclient-sdk.googlecode.com/svn/trunk/src

Patch Set: fix nits and tests Created 8 years, 2 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 | « visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.CppBuild.targets ('k') | visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Toolset.default.props » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 0981b4882a4ea6f20adc42d1a00e50f99f4c456c..4467973a58c986aabe8d52b7f506b2f4c41f210c 100644

--- a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Paths.default.props

+++ b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.Paths.default.props

@@ -20,6 +20,7 @@

<FrameworkSdkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)</FrameworkSdkDir>

<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>

<LibraryPath Condition="'$(LibraryPath)' == '' AND '$(TargetArchitecture)'=='i686'">$(VSNaClSDKRoot)lib32;</LibraryPath>

<LibraryPath Condition="'$(LibraryPath)' == '' AND '$(TargetArchitecture)'=='x86_64'">$(VSNaClSDKRoot)lib;</LibraryPath>