visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.props - Issue 11359218: [NaCl Addin] Add new property for setting name of index page.

Side by Side Diff: visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.props

Issue 11359218: [NaCl Addin] Add new property for setting name of index page. (Closed) Base URL: http://nativeclient-sdk.googlecode.com/svn/trunk/src

Patch Set: 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/NaCl/Props/nacl_general_ps.xml ('k') | visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/ImportAfter/PPAPI.override.props » ('j') | visual_studio/NativeClientVSAddIn/InstallerResources/examples/hello_world_gles/hello_world_gles/hello_world_gles.vcxproj » ('J')
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

3 <PropertyGroup>	3 <PropertyGroup>

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

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

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

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

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

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

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

11	11

12 <!-- Set IntDir and OutDir to a dummy value here to stop the builtin Default .props file	12 <!-- Set IntDir and OutDir to a dummy value here to stop the builtin Default .props file

13 from setting them. This allows us to set them to their real default va lues in the	13 from setting them. This allows us to set them to their real default va lues in the

14 .props file. By which time the user settings for ToolchainName in the v cproj file	14 .props file. By which time the user settings for ToolchainName in the v cproj file

15 will have been set. If we try to use $(ToolchainName) here it will alw ays evaluate	15 will have been set. If we try to use $(ToolchainName) here it will alw ays evaluate

16 to newlib. -->	16 to newlib. -->

17 <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">DUMM Y</IntDir>	17 <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">DUMM Y</IntDir>

18 <OutDir Condition="'$(OutDir)'==''">DUMMY</OutDir>	18 <OutDir Condition="'$(OutDir)'==''">DUMMY</OutDir>

19	19

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

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

	22 <NaClIndexHTML Condition="'$(NaClIndexHTML)'==''">index.html</NaClIndexHTML>

22 <NaClManifestPath Condition="'$(NaClManifestPath)'==''"></NaClManifestPath>	23 <NaClManifestPath Condition="'$(NaClManifestPath)'==''"></NaClManifestPath>

23 </PropertyGroup>	24 </PropertyGroup>

24	25

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

26	27

27 </Project>	28 </Project>

OLD	NEW