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

Side by Side Diff: visual_studio/NativeClientVSAddIn/InstallerResources/PNaCl/Microsoft.Cpp.PNaCl.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, 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 2
3 <PropertyGroup> 3 <PropertyGroup>
4 <PlatformShortName>NaCl64</PlatformShortName> 4 <PlatformShortName>PNaCl</PlatformShortName>
5 <PlatformArchitecture>64</PlatformArchitecture> 5 <PlatformArchitecture>32</PlatformArchitecture>
6 <TargetArchitecture>x86_64</TargetArchitecture> 6 <TargetArchitecture>pnacl</TargetArchitecture>
7 <PlatformToolset Condition="'$(PlatformToolset)' == ''">v110</PlatformToolse t> 7 <PlatformToolset Condition="'$(PlatformToolset)' == ''">v110</PlatformToolse t>
8 8
9 <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</Pro jectName> 9 <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</Pro jectName>
10 <TargetName Condition="'$(TargetName)'==''">$(ProjectName)_$(PlatformArchite cture)</TargetName> 10 <TargetName Condition="'$(TargetName)'==''">$(ProjectName)</TargetName>
11 <ToolchainName Condition="'$(ToolchainName)' == ''">newlib</ToolchainName> 11 <ToolchainName Condition="'$(ToolchainName)' == ''">newlib</ToolchainName>
12 <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'!=''">$(In termediateOutputPath)</IntDir> 12 <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'!=''">$(In termediateOutputPath)</IntDir>
13 13
14 <!-- Set IntDir and OutDir to a dummy value here to stop the builtin Default .props file 14 <!-- Set IntDir and OutDir to a dummy value here to stop the builtin Default .props file
15 from setting them. This allows us to set them to their real default va lues in the 15 from setting them. This allows us to set them to their real default va lues in the
16 .props file. By which time the user settings for ToolchainName in the v cproj file 16 .props file. By which time the user settings for ToolchainName in the v cproj file
17 will have been set. If we try to use $(ToolchainName) here it will alw ays evaluate 17 will have been set. If we try to use $(ToolchainName) here it will alw ays evaluate
18 to newlib. --> 18 to newlib. -->
19 <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">DUMM Y</IntDir> 19 <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">DUMM Y</IntDir>
20 <OutDir Condition="'$(OutDir)'==''">DUMMY</OutDir> 20 <OutDir Condition="'$(OutDir)'==''">DUMMY</OutDir>
21 21
22 <VSNaClSDKRoot Condition="'$(VSNaClSDKRoot)'==''">$(NACL_SDK_ROOT)\</VSNaClS DKRoot> 22 <VSNaClSDKRoot Condition="'$(VSNaClSDKRoot)'==''">$(NACL_SDK_ROOT)\</VSNaClS DKRoot>
23
24 <NaClToolchainRoot>$(VSNaClSDKRoot)toolchain\win_pnacl\</NaClToolchainRoot>
25
26 <NaClDefaultIncludePath Condition="'$(NaClDefaultIncludePath)'==''">$(NaClTo olchainRoot)usr\local\include;$(NaClToolchainRoot)usr\include</NaClDefaultInclud ePath>
27
28 <NaClDefaultIncludePath Condition="!Exists('$(NaClToolchainRoot)host_x86_32\ lib\clang\3.4')">$(NaClDefaultIncludePath);$(NaClToolchainRoot)\lib\clang\3.4\in clude</NaClDefaultIncludePath>
29
30 <NaClDefaultIncludePath Condition="Exists('$(NaClToolchainRoot)host_x86_32\l ib\clang\3.4')">$(NaClDefaultIncludePath);$(NaClToolchainRoot)host_x86_32\lib\cl ang\3.4\include</NaClDefaultIncludePath>
31
32 <NaClDefaultIncludePath Condition="Exists('$(NaClToolchainRoot)usr\include\c ++\v1')">$(NaClDefaultIncludePath);$(NaClToolchainRoot)usr\include\c++\v1</NaClD efaultIncludePath>
33
23 <NaClWebServerPort Condition="'$(NaClWebServerPort)'==''">5103</NaClWebServe rPort> 34 <NaClWebServerPort Condition="'$(NaClWebServerPort)'==''">5103</NaClWebServe rPort>
24 <NaClIndexHTML Condition="'$(NaClIndexHTML)'==''">index.html</NaClIndexHTML> 35 <NaClIndexHTML Condition="'$(NaClIndexHTML)'==''">index.html</NaClIndexHTML>
25 <NaClManifestPath Condition="'$(NaClManifestPath)'==''"></NaClManifestPath> 36 <NaClManifestPath Condition="'$(NaClManifestPath)'==''"></NaClManifestPath>
26 </PropertyGroup> 37 </PropertyGroup>
27 38
28 <Import Project="$(VCTargetsPath)\NaCl\NaCl.Toolset.default.props" /> 39 <Import Project="$(VCTargetsPath)\NaCl\NaCl.Toolset.default.props" />
29 40
30 </Project> 41 </Project>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698