visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.props - Issue 11266051: Add PNaCl support for VS addin.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.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, 1 month 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.targets ('k') | visual_studio/NativeClientVSAddIn/InstallerResources/PNaCl/Microsoft.Cpp.PNaCl.targets » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">	1 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

	2

2 <PropertyGroup>	3 <PropertyGroup>

3 <PlatformShortName>NaCl64</PlatformShortName>	4 <PlatformShortName>NaCl64</PlatformShortName>

4 <PlatformArchitecture>64</PlatformArchitecture>	5 <PlatformArchitecture>64</PlatformArchitecture>

5 <TargetArchitecture>x86_64</TargetArchitecture>	6 <TargetArchitecture>x86_64</TargetArchitecture>

6 <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</Pro jectName>	7 <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</Pro jectName>

7 <TargetName Condition="'$(TargetName)'==''">$(ProjectName)_$(PlatformArchite cture)</TargetName>	8 <TargetName Condition="'$(TargetName)'==''">$(ProjectName)_$(PlatformArchite cture)</TargetName>

8 <ToolchainName Condition="'$(ToolchainName)' == ''">newlib</ToolchainName>	9 <ToolchainName Condition="'$(ToolchainName)' == ''">newlib</ToolchainName>

9	10

10 <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'!=''">$(In termediateOutputPath)</IntDir>	11 <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'!=''">$(In termediateOutputPath)</IntDir>

11 <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">$(Pl atform)\$(ToolchainName)\$(Configuration)\</IntDir>	12 <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">$(Pl atform)\$(ToolchainName)\$(Configuration)\</IntDir>

12 <OutDir Condition="'$(OutDir)'==''">$(ProjectDir)$(Platform)\$(ToolchainName )\$(Configuration)\</OutDir>	13 <OutDir Condition="'$(OutDir)'==''">$(ProjectDir)$(Platform)\$(ToolchainName )\$(Configuration)\</OutDir>

13	14

14 <VSNaClSDKRoot Condition="'$(VSNaClSDKRoot)'==''">$(NACL_SDK_ROOT)\</VSNaClS DKRoot>	15 <VSNaClSDKRoot Condition="'$(VSNaClSDKRoot)'==''">$(NACL_SDK_ROOT)\</VSNaClS DKRoot>

15 <NaClWebServerPort Condition="'$(NaClWebServerPort)'==''">5103</NaClWebServe rPort>	16 <NaClWebServerPort Condition="'$(NaClWebServerPort)'==''">5103</NaClWebServe rPort>

16 <NaClManifestPath Condition="'$(NaClManifestPath)'==''"></NaClManifestPath>	17 <NaClManifestPath Condition="'$(NaClManifestPath)'==''"></NaClManifestPath>

17 </PropertyGroup>	18 </PropertyGroup>

	19

	20 <Import Project="$(VCTargetsPath)\NaCl\NaCl.Toolset.default.props" />

	21

18 </Project>	22 </Project>

OLD	NEW